First pass at #56
Merge pull request #902 from NickMk/master

First pass at #56