Changed to sparse matrix and some other stuff.
Merge origin/master