Refactor to match basic servlet requirements
Bugfix for PHPUnit test
Merge pull request #4 from wagnert/master

Refactor to match basic servlet requirements