closes #43
Merge pull request #61 from justinhrobbins/feature_43

closes #43