closes #146
Merge pull request #154 from justinhrobbins/feature_146

closes #146