Default: config block
Default: update config
Merge pull request #236 from hongoctrien/develop

Default: update config