Refactor for usage with latest WebServer version
Merge pull request #16 from wagnert/master

Refactor for usage with latest WebServer version