fixed error
Merge branch 'master' into heroku
updated heroku