Merge pull request #174 from justinstoller/update-helpers