Merge pull request #31 from Greego/master