closes #111
Merge pull request #113 from justinhrobbins/feature_111

closes #111