Moved keys from settings to environment variables.
Better error messages.
Merge branch 'develop'