Added javadoc
Merge pull request #810 from jidel/javadoc

Added javadoc