Modify the server to make it runnable with main()
Merge remote-tracking branch 'origin/master'