Rails 4 compatibility
Merge pull request #1 from djonasson/master

Rails 4 compatibility