Merge pull request #3 from wagnert/master

Refactoring for servlet engine