Servlet initial commit
fixes
fixes
Merge pull request #435 from stevenRush/master

Servlet