with servlet
Merge pull request #3 from crhisnoriega/github/master

with servlet