closes #65
Merge pull request #66 from justinhrobbins/feature_65

closes #65