Changes on Heroku master

Heroku version