merged sebastian's latest changes. changed gemfile.