update ruby
String.empty? must be used instead of nil?
Merge branch 'work'