moved calculations to different class
Merge pull request #25 from jskudlarski/master

Merged