fixed formatting, added comments
Merge branch 'master' of https://github.com/colln/sandmail