Added more javadoc and improved the description.
Merge remote-tracking branch 'origin/master'