Merge pull request #363 from glynnc/master

Remove some unnecessary floating-point calculations
Merge branch 'master' of https://github.com/glynnc/Player