remove unused ;
Another implementation of server and server_test
Merge remote-tracking branch 'origin/master'