Refactor to use servlet engine
Merge pull request #5 from wagnert/master

Refactor to use servlet engine