Merged the ryu-shim into the master branch