Added heroku support & emails