Adding timeout to RPC call when waiting for replies
Merge pull request #164 from papoola/master

Adding timeout to RPC call when waiting for replies