Merge pull request #9 from GideonWolfe/master