Merge pull request #16 from symonenkob/master

merge master to borys
Merge pull request #17 from symonenkob/Borys

Merge pull request #16 from symonenkob/master