Refactor: dry redundancies
Refactor: remove some more duplication
Update README
Merge pull request #63 from PierreR/master

Refactor: dry redundancies