Merge pull request #88 from prattpratt/master

A few updates to java-client
v1.6.2
Merge remote-tracking branch 'upstream/master'