(refactor) Improvements to server
Merge pull request #48 from phoenix16t/refactor/server

(refactor) Improvements to server