fix for ruby
Merge branch 'develop'