Brought master branch up to date with heroku branch