First pass at #84
Merge pull request #835 from NickMk/master

First pass at #84