Merge branch 'develop'
add integer rounding, but contains bug
Merge branch 'master' into develop