Renamed some variables, added JavaDocs.
Added JavaDocs.
Merge remote-tracking branch 'origin/master'