Rails4 compatible
Merge pull request #2 from matjack1/master

Rails4 compatible