diff --git a/.authors.yml b/.authors.yml
index 8ce621d1b..e7557e7f9 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -385,7 +385,7 @@
   email: lalochcz@gmail.com
   aliases:
   - laloch
-  num_commits: 159
+  num_commits: 161
   first_commit: 2018-07-26 13:51:50
   github: laloch
 - name: Nico Lehmann
@@ -435,7 +435,7 @@
   github: funkyfuture
 - name: Anthony Scopatz
   email: scopatz@gmail.com
-  num_commits: 2643
+  num_commits: 2650
   first_commit: 2015-01-21 17:04:13
   github: scopatz
 - name: anatoly techtonik
@@ -1021,7 +1021,7 @@
   first_commit: 2018-09-16 22:50:24
 - name: Gyuri Horak
   email: dyuri@horak.hu
-  num_commits: 17
+  num_commits: 31
   first_commit: 2019-06-18 12:00:16
   github: dyuri
 - name: Ke Zhang
@@ -1104,7 +1104,7 @@
   email: anki-code@users.noreply.github.com
   alternate_emails:
   - anki-code
-  num_commits: 61
+  num_commits: 67
   first_commit: 2019-10-15 18:20:58
   github: xxh
 - name: Sylvain Corlay
@@ -1128,7 +1128,7 @@
   github: marciomazza
 - name: Noortheen Raja
   email: jnoortheen@gmail.com
-  num_commits: 6
+  num_commits: 13
   first_commit: 2020-03-15 10:13:56
   github: jnoortheen
 - name: Samuel Lotz
@@ -1218,5 +1218,10 @@
   github: wendellwt
 - name: a
   email: a
-  num_commits: 67
+  num_commits: 97
   first_commit: 2020-10-08 15:17:00.327697
+- name: Will Shanks
+  email: willshanks@us.ibm.com
+  num_commits: 1
+  first_commit: 2020-10-13 11:26:03
+  github: willsALMANJ
diff --git a/.mailmap b/.mailmap
index eafb140e5..027c29e9a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -24,8 +24,8 @@ Jamie Bliss <jamie@ivylav.es> James Bliss <astronouth7303@gmail.com>
 Hugo Wang <w@mitnk.com>
 David Strobach <lalochcz@gmail.com> laloch <lalochcz@gmail.com>
 Bob Hyman <bob.hyman@bobssoftwareworks.com> Bob Hyman <bob.hyman@gmail.com>
-BlahGeek <i@BlahGeek.com>
 a <a>
+BlahGeek <i@BlahGeek.com>
 anki-code <anki-code@users.noreply.github.com> anki-code <anki-code>
 Jean-Benoist Leger <jb@leger.tf> Jean-Benoist Leger <jbleger@gertrude>
 Jean-Benoist Leger <jb@leger.tf> Jean-Benoist Leger <jbleger@hds.utc.fr>
@@ -38,6 +38,7 @@ Aaron Griffin <aig787@gmail.com>
 Rob Brewer <rwb123@gmail.com> Robert W. Brewer <rwb123@gmail.com>
 virus <virusbb001a@gmail.com>
 Sagar Tewari <sagartewari01@gmail.com> Sagar Tewari <sagartewariym@yahoo.com>
+Gyuri Horak <dyuri@horak.hu>
 Eadaen1 <eadaen@protonmail.com>
 Konstantin Molchanov <kmolchanov@machinezone.com> Konstantin Molchanov <moigagoo@live.com>
 Guillaume Leclerc <guillaume.leclerc@epfl.ch> Guillaume Leclerc <guillaume.leclerc.work@gmail.com>
@@ -55,12 +56,12 @@ con-f-use <con-f-use@users.noreply.github.com>
 VHarisop <the.machine.headed@gmail.com>
 JohnLunzer <lunzer@gmail.com> jlunz <lunz8748@usroc1miniwaas.corp.exelisinc.com>
 Paul Goelz <s8pagoel@stud.uni-saarland.de>
-Gyuri Horak <dyuri@horak.hu>
 Carmen Bianca Bakker <carmen@carmenbianca.eu>
 Frank Sachsenheim <funkyfuture@riseup.net> Frank Sachsenheim <funkyfuture@users.noreply.github.com>
 Kurtis Rader <krader@skepticism.us>
 cryzed <cryzed@googlemail.com>
 Brian Visel <eode@eptitude.net>
+Noortheen Raja <jnoortheen@gmail.com>
 cafehaine <kilian.guillaume@gmail.com>
 Andrew Hundt <ATHundt@gmail.com>
 Jonathan Slenders <jonathan@slenders.be>
@@ -91,7 +92,6 @@ Nathan Goldbaum <ngoldbau@illinois.edu> Nathan Goldbaum <goldbaum@ucolick.org>
 mel <mel@anybodytech.com>
 Jared Crawford <jmcrawford45@gmail.com>
 Mike Crowe <drmikecrowe@gmail.com> drmikecrowe <drmikecrowe@gmail.com>
-Noortheen Raja <jnoortheen@gmail.com>
 JuanPablo <jpabloaj@gmail.com>
 Ollie Terrance <ollie.terrance@live.co.uk>
 Marcel Bollmann <bollmann@linguistics.rub.de>
@@ -254,5 +254,6 @@ swedneck <40505480+swedneck@users.noreply.github.com>
 Feng Tian <fengttt@gmail.com>
 paugier <pierre.augier@univ-grenoble-alpes.fr>
 Wendell CTR Turner <Wendell.CTR.Turner@faa.gov>
+Will Shanks <willshanks@us.ibm.com>
 goodboy <tgoodlet@users.noreply.github.com>
 Atsushi Morimoto <atsushi.morimoto@dena.com>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index e6af768c6..24146c9d6 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -10,8 +10,8 @@ Authors are sorted by number of commits.
 * Hugo Wang
 * David Strobach
 * Bob Hyman
-* BlahGeek
 * a
+* BlahGeek
 * anki-code
 * Jean-Benoist Leger
 * christopher
@@ -23,6 +23,7 @@ Authors are sorted by number of commits.
 * Rob Brewer
 * virus
 * Sagar Tewari
+* Gyuri Horak
 * Eadaen1
 * Konstantin Molchanov
 * Guillaume Leclerc
@@ -38,12 +39,12 @@ Authors are sorted by number of commits.
 * VHarisop
 * JohnLunzer
 * Paul Goelz
-* Gyuri Horak
 * Carmen Bianca Bakker
 * Frank Sachsenheim
 * Kurtis Rader
 * cryzed
 * Brian Visel
+* Noortheen Raja
 * cafehaine
 * Andrew Hundt
 * Jonathan Slenders
@@ -74,7 +75,6 @@ Authors are sorted by number of commits.
 * mel
 * Jared Crawford
 * Mike Crowe
-* Noortheen Raja
 * JuanPablo
 * Ollie Terrance
 * Marcel Bollmann
@@ -237,5 +237,6 @@ Authors are sorted by number of commits.
 * Feng Tian
 * paugier
 * Wendell CTR Turner
+* Will Shanks
 * goodboy
 * Atsushi Morimoto