Some more calculation functions
Merge branch 'master' of https://github.com/phlsa/gmynd