refactor
Merge branch 'master' into heroku-edition

* master:
  refactor