Merge pull request #17 from symonenkob/Borys

Merge pull request #16 from symonenkob/master
Fixed bugs
Commit borys => master
revert