Merge pull request #11 from mtunique/master

init refactoring_server
Merge remote-tracking branch 'origin/master' into refactoring_server
Merge pull request #14 from mtunique/master

refactoring
Merge pull request #15 from mtunique/refactoring_server

Refactoring server