First pass at #20
Merge pull request #1012 from sjs/patch-2

First pass at #20