Updated with ruby 2.1