Feature 37 added.
More to feature 37
Merge pull request #4 from mcassady/feature/add_feature_37_49540361

Merged pull request #4