First Pass at #452
Merge pull request #786 from Modicrumb/patch-1

First Pass at #452