more JavaDocs
Merge branch 'radu-version'
little fix