Better commented out debug code.
Javadocs.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'