Merge pull request #18 from wagnert/master

Refactor for new servlet container servlet module