Modified stuff, will move to src file
Merge branch 'master' of https://github.com/ianlee/scalable-server