Merge pull request #1 from alexkavon/patch-2

Patch 2
Merge pull request #2 from alexkavon/patch-2

Patch 2
bug fixes
bug fixes, message changes