#48
Merge pull request #196 from rhsu/review48

#48
Merge branch 'master' into Matrix2