First pass at #417
Merge pull request #815 from trusche/patch-2

First pass at #417