Added stuff in preparation for Heroku