Fix typo
Merge with heroku branch