Improved documentation and javadoc
Improved documentation and javadoc