first pass at #252
Merge pull request #869 from NickMk/master

first pass at #252