#40
Merge pull request #63 from justinhrobbins/feature_59

closes #40