First pass at #118
Merge pull request #692 from ritchiewilson/patch-1

First pass at #118