tomcat support

once again because I've deleted tomcat branch and pushed changes to master