rails 4 support
Merge pull request #1 from hendricius/rails4

rails 4 support