Feature/ruby 1.9 regexp fix