rails 4 compatibility
Merge pull request #12 from rubysolo/rails4

rails 4 compatibility