hard tested and fixed amounts as floats
Merge branch 'hotfix/0.1.8'