Fixed to be compatible with Tomcat6
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa