optimize the configuration
Merge origin/master