Merge pull request #48 from fsb4000/RPC