Ruby setup
Merged changes