Task dev/#44
Calculate amounts implementation.
Small correction.
Merge pull request #56 from Maciekek/dev/#44

Dev/#44
Merge branch 'master' into dev/#54