Merge pull request #2 from keenanjohnson/master