First pass at #290
Merge pull request #853 from NickMk/master

First pass at #290