Feature/ruby 2.1.2