Add ruby stuff
Merge