Merge pull request #276 from wagnert/master

Refactoring persistent servlet engine