Merge pull request #9 from Course-Master/master

adapt to the latest kaminari hack
Merge pull request #1 from hermango/master

Merge pull request #9 from Course-Master/master