fix module name
Add comments
Merge branch 'master' into jetty