Refactored Repository
Merge branch 'master' of https://github.com/aaparella/E2C