Update calculations
Merge pull request #72 from jarmokortetjarvi/startup

Update calculations