refactoring codes
Merge branch 'master' of https://github.com/mtcld/Server-0.1