Merge pull request #41 from groupon/dwillson/update

merged