grr
Merge branch 'master' of https://github.com/taitulism/heroku-qaza