Don't overwrite a custom message
Merge pull request #15 from Captricity/master

Don't overwrite a custom message