closes #164
Merge pull request #165 from justinhrobbins/feature_164

closes #164