Added changes from heroku branch