Merge pull request #36 from jrhe/master

Rails 4 fix