Servlet preparations
Last changes before christmas
before clean up
fixed #52
fixed #44