Accept empty string as a message
Merge branch 'feature/messages'