Updated to include ruby 2.0