Updated to Ruby 2.1.0 + minor tweaks