merging jProxy.java into master
Merge branch 'dev'
updating jProxy methods and Timeout configuration