Improve messages

fixes #28
Merge branch 'fix-msg-problem'