adding some javadoc to the classes...
Merge remote-tracking branch 'origin/master'