closes #139
Merge pull request #143 from justinhrobbins/feature_139

closes #139