Improved Global Settings
Merge branch 'develop'