Merge pull-request #145 (Json-RPC fix)