Heroku additional changes
pulled origin & merged