First pass at #254
Merge pull request #873 from wigginus/patch-1

First pass at #254