Fixes #20 - Extend Servlet support to 3.0