Update calculations
Merge pull request #71 from jarmokortetjarvi/startup

Update calculations