Fixed syntax errors
Merge branch 'heroku'