Merge pull request #44 from eugenyk/master