Rails 4.1 compatibility
Merge pull request #1 from semenyukdmitriy/master

Rails 4.1 compatibility