diff --git a/src/core/bmath/complex.cpp b/src/core/bmath/complex.cpp
index d71cfef..7a209b9 100644
--- a/src/core/bmath/complex.cpp
+++ b/src/core/bmath/complex.cpp
@@ -3,7 +3,7 @@
 /** 
  * Constructor implementation
  */ 
-Core::Bmath::Complex::Complex(Long real,Long imaginary){
+Core::Bmath::Complex::Complex(Double real,Double imaginary){
     this->real=real;
     this->imaginary=imaginary;
 };
diff --git a/src/core/bmath/complex.hpp b/src/core/bmath/complex.hpp
index 06d3e58..be145ec 100644
--- a/src/core/bmath/complex.hpp
+++ b/src/core/bmath/complex.hpp
@@ -10,18 +10,18 @@ namespace Core{
     namespace Bmath{
         class Complex{
             private:
-                Long real;
-                Long imaginary;
+                Double real;
+                Double imaginary;
             
             public:
-                Complex(Long real,Long imaginary);
+                Complex(Double real,Double imaginary);
                 Complex& operator+=(const Complex& rightOp);
                 Complex operator+(const Complex &rightOp);
                 Complex operator*(const Complex &rightOp);
                 
                 //Overload to enable toString operations
                 friend std::ostream& operator<<(std::ostream &stream, Core::Bmath::Complex const &c){
-                    return stream << "(" << c.real << ", " << c.imaginary << "i)";
+                    return stream << "(" << c.real << "+" << c.imaginary << "i)";
                 }
         };
     };