Merge pull request #190 from bphinz/master

Java viewer updates