closes #159
fixes #159
Merge pull request #163 from justinhrobbins/feature_159

closes #159