#96
Merge pull request #98 from justinhrobbins/feature_96

#96