Feature/ruby2.1.5