removed the need of the servlet context as per issue #11