Added javadoc and necessary commenting on the code.
Merge remote-tracking branch 'origin/master'