Merge pull request #34 from antonlogvinenko/master

master