Fixed merge conflict(?)
Merge branch 'master' of https://github.com/RobBosman/rpc.git