Refactor for servlet engine
Refactoring for servlet engine
Merge with sydekumf
Merge pull request #3 from wagnert/master

Refactoring for servlet engine