Reverted back to ruby 2.0.0 for the merge