Fixed issue with rounding
Merge branch 'feature/fix' into develop