Syncing master from dev

Pinnning of ruby version.