First pass at #238
Merge pull request #698 from NickMk/master

First pass at #238