Cleanup and comment code.
Merge branch 'master' of https://github.com/estromlund/MarcoPolo