improve messages
Merge pull request #16 from Vdimir/master

improve messages