Updated the Macros header file as well as the Matrix class. Some Matrix.cpp function temporarily commented out for optimization rewrites.