Feature/9 javadoc improvement

Improved javadoc.