rails 4 support
Merge remote-tracking branch 'nicolaracco/master'