Merge pull request #125 from fsb4000/rpc