Second pass
Merge pull request #905 from NickMk/master

Second pass