Merge branch 'hotfix/0.1.1'
Fix calculation issue (IMPORTANT)

The previous formular was wrong.
The previous version should not be used any more
Bump version
Merge branch 'hotfix/0.1.2' into develop