Changed calculation
Merge branch 'master' of github.com:loed-idzinga/lifefire