closes #104
Merge pull request #106 from justinhrobbins/feature_104

closes #104