closes #88; closes #90
Merge pull request #92 from justinhrobbins/feature_88

closes #88; closes #90