Update for Rails 4 compatibility
Merge pull request #11 from zeeyang/master

Update for Rails 4 compatibility