added JavaDoc
Merge origin/master