new calculation
Merge branch 'master' of https://github.com/samheather/SpotTheStation