improve the server
Merge pull request #3 from mndvns/server-refactor

improve the server