udpated ruby version
Merge branch 'develop'