Merge branch 'resolve-heroku-trollop-probrem'