Merge pull request #20 from jonwolfe/master