Capybara integrated
Merge branch 'capybara'