closes #76
Merge pull request #79 from justinhrobbins/feature_76

closes #76