add config
fix bug
update bench
Merge branch 'master' into benchmark