Merge pull request #38 from LostInBrittany/issue25

Issue #25: Please expose message address publicly
Some cleaning and groovying
Some cleaning and groovying
Some cleaning and groovying
Some cleaning and groovying
Merge pull request #39 from LostInBrittany/cleaning

Some cleaning and groovifying