Merge pull request #1 from kylegordon/master