Merge pull request #22 from jlovejoy/patch-1