First pass at #422
Merge pull request #774 from NickMk/master

First pass at #422