Fixed for Rails 4
Merge branch 'semenyukdmitriy-master'