Improve message
Merge pull request #569 from lem9/master

Improve message