Added heroku compatibility