A minor update for heroku deployment.
Merge branch 'dev'