Calculation cleaned up
Merge branch 'master' of https://github.com/And7s/MolSim
merge