Updated files
Merge branch 'master-0.8' of https://github.com/splitting/matrix into master-0.8