closes #132
Merge pull request #134 from justinhrobbins/feature_132

closes #132