Trying to catch foo_feature up with master
Merge pull request #2 from wgoolsby/foo_feature

Trying to catch foo_feature up with master