rails 4 compatibility
Merge pull request #1 from PlugIN73/master

4 rails compatibility