closes #77
Merge pull request #78 from justinhrobbins/feature_77

closes #77