Duplication refactoring
Merge branch 'master' of github.com:Sankore/Sankore-3.1