First pass at #301
Merge pull request #778 from ahadb/patch-1

First pass at #301