Initial version with --addMateTags support.