better rpc handling
Merge branch 'origin/master'