Merge pull request #30 from gyeben/master