diff --git a/Makefile b/Makefile
index dd4f0ef..0d7e294 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #=======================================================================================
 #
-#     Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+#     Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
 #     Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
 #
 #     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/bench.pl b/bench.pl
index 69c91eb..207f8ec 100755
--- a/bench.pl
+++ b/bench.pl
@@ -1,4 +1,30 @@
 #!/usr/bin/env perl
+
+# =======================================================================================
+#
+#      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
+#      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
+#
+#      Permission is hereby granted, free of charge, to any person obtaining a copy
+#      of this software and associated documentation files (the "Software"), to deal
+#      in the Software without restriction, including without limitation the rights
+#      to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#      copies of the Software, and to permit persons to whom the Software is
+#      furnished to do so, subject to the following conditions:
+#
+#      The above copyright notice and this permission notice shall be included in all
+#      copies or substantial portions of the Software.
+#
+#      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#      AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+#      SOFTWARE.
+#
+# =======================================================================================
+
 use strict;
 use warnings;
 use utf8;
diff --git a/src/affinity.c b/src/affinity.c
index 787705c..19f4358 100644
--- a/src/affinity.c
+++ b/src/affinity.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/allocate.c b/src/allocate.c
index eaaa5e3..2ad9236 100644
--- a/src/allocate.c
+++ b/src/allocate.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/copy.c b/src/copy.c
index 360a388..198da85 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/daxpy.c b/src/daxpy.c
index 93926ac..9433381 100644
--- a/src/daxpy.c
+++ b/src/daxpy.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/includes/affinity.h b/src/includes/affinity.h
index 9c7eecf..80f531e 100644
--- a/src/includes/affinity.h
+++ b/src/includes/affinity.h
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -33,4 +33,3 @@ extern void affinity_pinProcess(int);
 extern void affinity_pinThread(int);
 
 #endif /*AFFINITY_H*/
-
diff --git a/src/includes/allocate.h b/src/includes/allocate.h
index a6ee561..1e83fe0 100644
--- a/src/includes/allocate.h
+++ b/src/includes/allocate.h
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/includes/likwid_markers.h b/src/includes/likwid_markers.h
index 76351d2..ab47a0f 100644
--- a/src/includes/likwid_markers.h
+++ b/src/includes/likwid_markers.h
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/includes/timing.h b/src/includes/timing.h
index 79bdf95..b7260cb 100644
--- a/src/includes/timing.h
+++ b/src/includes/timing.h
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/init.c b/src/init.c
index 373466e..f139697 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/main.c b/src/main.c
index 9c85d55..465bf31 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/sdaxpy.c b/src/sdaxpy.c
index a7c45da..5de842d 100644
--- a/src/sdaxpy.c
+++ b/src/sdaxpy.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/striad.c b/src/striad.c
index 6edecf5..c4cf806 100644
--- a/src/striad.c
+++ b/src/striad.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/sum.c b/src/sum.c
index 111bd56..d3e4879 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/timing.c b/src/timing.c
index 6b3f07b..2daf260 100644
--- a/src/timing.c
+++ b/src/timing.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/triad.c b/src/triad.c
index e7336bb..15fefcb 100644
--- a/src/triad.c
+++ b/src/triad.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/update.c b/src/update.c
index 94d1dc7..e347680 100644
--- a/src/update.c
+++ b/src/update.c
@@ -1,7 +1,7 @@
 /*
  * =======================================================================================
  *
- *      Author:   Jan Eitzinger (je), jan.treibig@gmail.com
+ *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
  *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy