Merge pull request #35 from btaidm/development

Calculations on server