Fixed some messages not showing up right (caused by commit fb572d3d6742ab9f78a2bb500a699ea29d42b4ba)
Merge pull request #24 from Hydrothermal/dev

Fixed some messages not showing up right