Merge pull request #28 from simonpasquier/fix-repo-classes

Fix repo classes