Merge pull request #40 from hazendaz/master

Tomcat 8.0.11