Harvey's changes
Did more work.
Merge branch 'master' of github.com:hach-que/RedMeansGo
more stuff