merging from Ruby