Fix 51
Merge pull request #78 from mmarsman1/development

Fixes #51