We actually work in ruby 2.0 as well
Merge remote-tracking branch 'upstream/master'