First pass at #390
Merge pull request #705 from NickMk/master

First pass at #390