Trunk344

Updated Java Docs and tests.