Rubybluev2

Putting my branches upstream