Finish question 2
Merge branch 'ruby'
Fix merge conflicts