update config
Merge branch '13'