Merge pull request #16 from symonenkob/master

merge master to borys