Merge branch 'development'
Add support for Rails 4.1