closes #128
Merge pull request #133 from justinhrobbins/feature_128

closes #128