Merge pull request #120 from justinhrobbins/feature_117

Feature 117
#100
Merge pull request #121 from justinhrobbins/feature_100

#100
#119
Merge pull request #122 from justinhrobbins/feature_119

#119
integration test for #117