Fixes
Merge pull request #1158 from ahomatthew/develop

Fixes