Quick sanitization on messages
Merge pull request #2 from Nikerabbit/master

Messages check