bug fixes, code comments, etc
Merge branch 'master' of https://github.com/acmacalister/mercury