Updated to use ruby 2.0