Changed error text format
Merge remote-tracking branch 'origin/master'
Fixing the problem in the last commit
Fixed #155