add user
remove useagent
Merge branch 'f2'