close #184
close#182
Merge pull request #186 from rhsu/issue182

close#182
Merge pull request #187 from rhsu/issue184

close #184
Merge branch 'master' into Matrix2