First Pass at #450
Merge pull request #807 from Modicrumb/patch-1

First Pass at #450