rails 4 fix
Merge pull request #37 from smasry/rails4

rails 4 fix