Merge pull request #34 from btaidm/master

Network Calculations on server