Use constructor instead factory method
Merge branch 'master' into with_poll

Conflicts:
	src/server.cpp