Update for rails 4.1
Merge pull request #23 from pilou-/rails4.1

Update for rails 4.1