fixes #116
Merge pull request #117 from dylan8902/development

fixes #116