#73: Added Tomcat 8 support