rails 4
Merge pull request #1 from marwich/rails4

rails 4