added Tomcat 8 support