added some javadocs
Merge remote-tracking branch 'upstream/master'
Merge pull request #377 from rjynn/master

added javadocs