fix for issue #15 (empty messages)
Merge branch 'master' of https://github.com/leoya/messenger