close#274
Merge pull request #283 from rhsu/274

close#274
Merge branch 'master' into MathFactory