push
Merge pull request #190 from rhsu/miscMasterCleanup

push
Merge branch 'master' into Matrix2