Some JavaDoc
Merge branch 'mylocal'