Added changes from Heroku documentation