Fixed #86, update rpc call method according to toolkit api change
Merge from origin/master