remove useless buffer
Add way for oper to shut down the server
Merge branch 'master' into api