Fix #17 - Remove dependency on Servlet API v2.5