Refactor to work with new servlet engine
Merge pull request #16 from wagnert/master

Refactor to work with new servlet engine