Small changes
Merge pull request #76 from soosterwaal/servlet

Small changes