diff --git a/.mailmap b/.mailmap
index 9b2656a..252205c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,7 @@
 Aron Ahmadia <aron@ahmadia.net>
 Phillip Alderman <phillip.d.alderman@gmail.com>
-James Allen <james@sharelatex.com> <jamesallen0108@gmail.com>
+James Allen <james@sharelatex.com>
+James Allen <jamesallen0108@gmail.com>
 Piotr Banaszkiewicz <piotr@banaszkiewicz.org>
 Pauline Barmby <pbarmby@uwo.ca>
 Radovan Bast <bast@users.noreply.github.com>
@@ -9,13 +10,16 @@ Andy Boughton <pchemist@gmail.com>
 Erik M. Bray <embray@stsci.edu>
 Amy Brown <arbrown@latte.ca>
 C. Titus Brown <titus@idyll.org>
-Abigail Cabunoc Mayes <abigail.cabunoc@gmail.com> <abigail.cabunoc@oicr.on.ca>
+Abigail Cabunoc Mayes <abigail.cabunoc@gmail.com>
+Abigail Cabunoc Mayes <abigail.cabunoc@oicr.on.ca>
 Greg Caporaso <gregcaporaso@gmail.com>
 Neal Davis <davisneale@gmail.com>
 Matt Davis <jiffyclub@gmail.com>
 Gabriel A. Devenyi <gdevenyi@gmail.com>
-Jonah Duckles <jonah@duckles.org> <jonahd@gmail.com>
-Rémi Emonet <remi@heeere.com> <remi.emonet@univ-st-etienne.fr>
+Jonah Duckles <jonah@duckles.org>
+Jonah Duckles <jonahd@gmail.com>
+Rémi Emonet <remi@heeere.com>
+Rémi Emonet <remi.emonet@univ-st-etienne.fr>
 Ivan Gonzalez <iglpdc@gmail.com>
 John Gosset <john.gosset@gmail.com>
 Alistair Grant <alistair.grant@ed.ac.uk>
@@ -39,12 +43,16 @@ Aaron O'Leary <aaron.oleary@gmail.com>
 Jeramia Ory <jeramia.ory@gmail.com>
 Fernando Perez <Fernando.Perez@berkeley.edu>
 Jon Pipitone <jon.pipitone@utoronto.ca>
-Timothée Poisot <t.poisot@gmail.com> <tim@poisotlab.io>
+Timothée Poisot <t.poisot@gmail.com>
+Timothée Poisot <tim@poisotlab.io>
 Leighton Pritchard <leightonpritchard@mac.com>
 Andrey Prokopenko <aprokop@sandia.gov>
 Scott Ritchie <sritchie73@gmail.com>
-Maneesha Sane <ahseenam@gmail.com> <ahseenam@gmail.com>
-Raniere Silva <ra092767@ime.unicamp.br> <raniere@ime.unicamp.br> <raniere@rgaiacs.com>
+Maneesha Sane <ahseenam@gmail.com>
+Maneesha Sane <ahseenam@gmail.com>
+Raniere Silva <ra092767@ime.unicamp.br>
+Raniere Silva <raniere@ime.unicamp.br>
+Raniere Silva <raniere@rgaiacs.com>
 Arfon Smith <arfon.smith@gmail.com>
 Ashwin Srinath <ashwinsrnth@gmail.com>
 Sarah Stevens <sstevens2@wisc.edu>
@@ -53,14 +61,27 @@ Tracy Teal <tracyt@idyll.org>
 Olav Vahtras <vahtras@kth.se>
 Roman Valls Guimera <brainstorm@nopcode.org>
 Philipp Von Bieberstein <pbieberstein@email.arizona.edu>
-Andrew Walker <a.walker@leeds.ac.uk> <andrew.walker@bristol.ac.uk>
+Andrew Walker <a.walker@leeds.ac.uk>
+Andrew Walker <andrew.walker@bristol.ac.uk>
 Ben Waugh <b.waugh@ucl.ac.uk>
 Ethan White <ethan@weecology.org>
 Tyson Whitehead <twhitehead@gmail.com>
 Jason Williams <JasonJWilliamsNY@gmail.com>
 Carol Willing <carolcode@willingconsulting.com>
-Greg Wilson <gvwilson@software-carpentry.org> <gvwilson@third-bit.com>
+Greg Wilson <gvwilson@software-carpentry.org>
+Greg Wilson <gvwilson@third-bit.com>
 Tom Wright <tom@maladmin.com>
 Nick Young <nick.young@auckland.ac.nz>
 Lee Zamparo <zamparo@gmail.com>
 Andrea Zonca <code@andreazonca.com>
+Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Aleksandra Nenadic <a.nenadic@manchester.ac.uk>
+Evan P. Williamson <evanpeterw@gmail.com>
+John Blischak <jdblischak@gmail.com>
+Kunal Marwaha <marwahaha@berkeley.edu>
+Lukas Weber <lukmweber@gmail.com>
+Marianna Foos <mfoos@users.noreply.github.com>
+Sarah Clayton <sclayton29@users.noreply.github.com>
+Stefan Topfstedt <stefan.topfstedt@ucsf.edu>
+Stefan Topfstedt <Stefan.Topfstedt@ucsf.edu>
+Yashasvi Girdhar <yash.girdhar@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 35da87f..3bad6a1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -64,3 +64,12 @@ Tom Wright
 Nick Young
 Lee Zamparo
 Andrea Zonca
+Aleksandra Nenadic
+Evan P. Williamson
+John Blischak
+Kunal Marwaha
+Lukas Weber
+Marianna Foos
+Sarah Clayton
+Stefan Topfstedt
+Yashasvi Girdhar