Rails 4 compatibility
Merge pull request #5 from Dantemss/master

Rails 4 compatibility