Code cleanup thanks to Andrew and Jon...
Merge branch 'master' of https://github.com/ANW180/Group27