Add messsage
Merge pull request #1 from thenighttrain/master

Major improvements