Rails 4 compatibility
Merge pull request #5 from sergio-ago/master

Rails 4 compatibility