Fixed issue #65 and iproved rpc classes