fixes #217
Merge pull request #223 from sorenmacbeth/develop

fixes #217