merging jProxy.java into master