rails 4 compatability
Merge pull request #2 from nathanscott/master

rails 4 compatability