Added color support and fixed method naming and matrix class.