Moved new branch for Rails 3 support