Merge pull request #36 from nortikin/master

sync
Small fixes to make matrix input work
Merge pull request #77 from ly29/master

matrix fixes for index view