closes #60
Merge pull request #70 from justinhrobbins/feature_60

closes #60