First pass at #45
Merge pull request #630 from garrettpauls/patch-1

First pass at #45