Update gem
Merge branch 'develop'