merged sebastian's latest changes. ran bundle install.