Added heroku-specific stuff