better messages
better messages
better messages
Merge pull request #1180 from belforte/master

better messages