rails 4 compatibility
Merge pull request #3 from ccutrer/master

rails 4 compatibility