Refactoring for new web server version
Merge pull request #18 from wagnert/master

Refactoring for new web server version