update my branch
Merge branch 'marc' of https://github.com/jcraley/deduplicator into marc