Merge pull request #2224 from ace20022/jsonrpc