First pass at #181
Merge pull request #716 from NickMk/master

First pass at #181