Merge branch 'master' into develop
finish a rounding test, however the rounding strategy is not robust, needs other checking method
Merge branch 'develop'