Merge pull request #39 from hazendaz/master

Tomcat 7.0.55