change settings
Merge branch 'master' into linux
fix for linux