remove lib, add config
remove lib, add config
remove lib, add config
Merge remote-tracking branch 'origin/master'