Merge branch 'master' into development
Add check for Heroku env vars
Merge branch 'development'