Rails4 update
Merge pull request #4 from matjack1/rails4

Rails4 update