README fix
Merge branch 'master' into heroku