Refactoring for new stateful server implementation
Bugfixing for new stateful server implementation
Merge pull request #8 from wagnert/master

Refactoring for new stateful server implementation