fixed custom messages
Merge pull request #159 from kmabey/LocalDev

fixed custom messages