Merge pull request #2 from KurtStam/master

adding tomcat support