Update bundle install
Add features
Merge
Merge branch 'sshamoto-chapter3'
Merge