new config and tool
Merge remote-tracking branch 'remotes/origin/1.0'