First pass at #482
Merge pull request #1118 from kuyan/patch-1

First pass at #482