closes #151
Merge pull request #152 from justinhrobbins/feature_151

closes #151