javadoc refactoring
Merge pull request #449 from baev/javadoc-refactoring

Javadoc refactoring. Part 1