Updated heroku branch with changes from master