denolehov Merge pull request #34 from MikhaD/master