fix issues about heroku
Merge branch 'develop'