Adding features
Fix dependency
Merge pull request #79 from groupon/doug/update2

Doug/update2