Merge pull request #1 from Teplitsa/master

rewrite
errror message style +  coner fix
Merge pull request #3 from HZ-labs/master

error message style + coner fix