Removed commented debugging code and updated JavaDoc.
Merge origin/master