Improve messages slightly
Merge pull request #5 from unikent/master

Improve messages slightly