Fixes
Merge branch 'master' of https://github.com/htumba/Tomcat7