closes #103
Merge pull request #112 from justinhrobbins/feature_103

closes #103
closes #111