Signed-off-by: bdzzz <gavadinov@gmail.com>
Some minor bug fixes
Pull request 2 ... fixed the fix
Merge pull request #4 from bdzzz/master

Fixed errors from the last pull request