tomcat 7
Merge pull request #5 from grams/tomcat7

tomcat 7