Ruby
New stuff!
Fixed merge