Capybara

Merging capybara changes.