add config
add another option to config
Merge branch 'master' into config