Made heroku compatible