added heroku compatibality