Adding javadoc
Merge origin/master