merged head into branch for further tomcat development