Merge pull request #23 from johnnypeck/patch-1