Changes to calculations
Merge branch 'master' of https://github.com/jloosli/Adafruit-Raspberry-Pi-Python-Code