First pass at #436
Merge pull request #830 from NickMk/master

First pass at #436