rails4 ready
Merge pull request #5 from Fodoj/rails4

Rails 4 ready