Enhancements by @lericson
Merge branch 'master' of https://github.com/isacarnekvist/Tron.git