Partly fixes my messages issue
Merge pull request #27 from eldelacajita/master

Partly fixes my messages issue