closes #59
Merge pull request #62 from justinhrobbins/feature_59

closes #59