closes #64
Merge pull request #71 from justinhrobbins/feature_64

closes #64