diff --git a/README.md b/README.md
index 6d588d7e..00c2674d 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,7 @@ Please, attribute this work by a citation to
 
 # Authors & Contributors
   * Andrey Antipov <Andrey.E.Antipov\at\gmail.com>
-  * Igor Krivenko <igor.s.krivenko\at\gmail.com>
+  * Igor Krivenko <iskrivenko\at\proton.me>
   * Mikhail Alejnikov
   * Alexey Rubtsov
   * Christoph Jung
diff --git a/include/mpi_dispatcher/misc.hpp b/include/mpi_dispatcher/misc.hpp
index 60ef9a63..a9ecafc5 100644
--- a/include/mpi_dispatcher/misc.hpp
+++ b/include/mpi_dispatcher/misc.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/mpi_dispatcher/misc.hpp
 /// \brief Miscellaneous MPI-related functions.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_MPI_DISPATCHER_MISC_HPP
 #define POMEROL_INCLUDE_MPI_DISPATCHER_MISC_HPP
diff --git a/include/mpi_dispatcher/mpi_dispatcher.hpp b/include/mpi_dispatcher/mpi_dispatcher.hpp
index d056ce8d..fe74e4ed 100644
--- a/include/mpi_dispatcher/mpi_dispatcher.hpp
+++ b/include/mpi_dispatcher/mpi_dispatcher.hpp
@@ -11,7 +11,7 @@
 /// \file include/mpi_dispatcher/mpi_dispatcher.hpp
 /// \brief A master-worker parallelization scheme using non-blocking MPI communications.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_MPI_DISPATCHER_MPI_DISPATCHER_HPP
 #define POMEROL_INCLUDE_MPI_DISPATCHER_MPI_DISPATCHER_HPP
diff --git a/include/mpi_dispatcher/mpi_skel.hpp b/include/mpi_dispatcher/mpi_skel.hpp
index bb16814a..abba0f57 100644
--- a/include/mpi_dispatcher/mpi_skel.hpp
+++ b/include/mpi_dispatcher/mpi_skel.hpp
@@ -11,7 +11,7 @@
 /// \file include/mpi_dispatcher/mpi_skel.hpp
 /// \brief Utilities for MPI-parallelized calculation of computable objects.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_MPI_DISPATCHER_MPI_SKEL_HPP
 #define POMEROL_INCLUDE_MPI_DISPATCHER_MPI_SKEL_HPP
diff --git a/include/pomerol.hpp b/include/pomerol.hpp
index f91132e8..6a3db15f 100644
--- a/include/pomerol.hpp
+++ b/include/pomerol.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol.hpp
 /// \brief Main "include-all" header of the library.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_HPP
 #define POMEROL_INCLUDE_POMEROL_HPP
diff --git a/include/pomerol/ChaseIndices.hpp b/include/pomerol/ChaseIndices.hpp
index 57103315..4dedf80c 100644
--- a/include/pomerol/ChaseIndices.hpp
+++ b/include/pomerol/ChaseIndices.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/ChaseIndices.hpp
 /// \brief `Chase indices` algorithm used in multipoint correlator calculations.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_CHASEINDICES_HPP
 #define POMEROL_INCLUDE_POMEROL_CHASEINDICES_HPP
diff --git a/include/pomerol/ComputableObject.hpp b/include/pomerol/ComputableObject.hpp
index c9d3c069..e2bdb6a6 100644
--- a/include/pomerol/ComputableObject.hpp
+++ b/include/pomerol/ComputableObject.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/ComputableObject.hpp
 /// \brief A base class for computable objects, e.g. Green's function, two-particle GF, etc.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_COMPUTABLEOBJECT_HPP
 #define POMEROL_INCLUDE_POMEROL_COMPUTABLEOBJECT_HPP
diff --git a/include/pomerol/DensityMatrix.hpp b/include/pomerol/DensityMatrix.hpp
index b5c47875..41a9aecc 100644
--- a/include/pomerol/DensityMatrix.hpp
+++ b/include/pomerol/DensityMatrix.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/DensityMatrix.hpp
 /// \brief Many-body Gibbs density matrix as a list of diagonal blocks.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_POMEROL_DENSITYMATRIX_HPP
diff --git a/include/pomerol/DensityMatrixPart.hpp b/include/pomerol/DensityMatrixPart.hpp
index ce4f24cd..cba96f72 100644
--- a/include/pomerol/DensityMatrixPart.hpp
+++ b/include/pomerol/DensityMatrixPart.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/DensityMatrixPart.hpp
 /// \brief Diagonal block of a many-body Gibbs density matrix.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_POMEROL_DENSITYMATRIXPART_HPP
diff --git a/include/pomerol/EnsembleAverage.hpp b/include/pomerol/EnsembleAverage.hpp
index 6025f74d..f01ed4a2 100644
--- a/include/pomerol/EnsembleAverage.hpp
+++ b/include/pomerol/EnsembleAverage.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/EnsembleAverage.hpp
 /// \brief Ensemble average of a monomial operator representing a physical observable.
 /// \author Junya Otsuki (j.otsuki@okayama-u.ac.jp)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_POMEROL_ENSEMBLEAVERAGE_HPP
diff --git a/include/pomerol/FieldOperatorContainer.hpp b/include/pomerol/FieldOperatorContainer.hpp
index d509770a..0aa1b053 100644
--- a/include/pomerol/FieldOperatorContainer.hpp
+++ b/include/pomerol/FieldOperatorContainer.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/FieldOperatorContainer.hpp
 /// \brief A container for creation and annihilation operators.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_POMEROL_FIELDOPERATORCONTAINER_HPP
diff --git a/include/pomerol/GFContainer.hpp b/include/pomerol/GFContainer.hpp
index b8fbc550..de86e9bb 100644
--- a/include/pomerol/GFContainer.hpp
+++ b/include/pomerol/GFContainer.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/GFContainer.hpp
 /// \brief Storage for multiple fermionic single-particle Matsubara Green's functions.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_GFCONTAINER_HPP
 #define POMEROL_INCLUDE_POMEROL_GFCONTAINER_HPP
diff --git a/include/pomerol/GreensFunction.hpp b/include/pomerol/GreensFunction.hpp
index 1f9005b3..65578251 100644
--- a/include/pomerol/GreensFunction.hpp
+++ b/include/pomerol/GreensFunction.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/GreensFunction.hpp
 /// \brief Fermionic single-particle Matsubara Green's function.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_POMEROL_GREENSFUNCTION_HPP
diff --git a/include/pomerol/GreensFunctionPart.hpp b/include/pomerol/GreensFunctionPart.hpp
index a9692416..683c8b38 100644
--- a/include/pomerol/GreensFunctionPart.hpp
+++ b/include/pomerol/GreensFunctionPart.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/GreensFunctionPart.hpp
 /// \brief Part of a fermionic single-particle Matsubara Green's function.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_POMEROL_GREENSFUNCTIONPART_HPP
diff --git a/include/pomerol/Hamiltonian.hpp b/include/pomerol/Hamiltonian.hpp
index dd180eb2..7526e5da 100644
--- a/include/pomerol/Hamiltonian.hpp
+++ b/include/pomerol/Hamiltonian.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/Hamiltonian.hpp
 /// \brief Storage and diagonalization of a Hamiltonian matrix.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_HAMILTONIAN_HPP
 #define POMEROL_INCLUDE_POMEROL_HAMILTONIAN_HPP
diff --git a/include/pomerol/HamiltonianPart.hpp b/include/pomerol/HamiltonianPart.hpp
index 3779d137..b43e7882 100644
--- a/include/pomerol/HamiltonianPart.hpp
+++ b/include/pomerol/HamiltonianPart.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/HamiltonianPart.hpp
 /// \brief Storage and diagonalization of a Hamiltonian matrix block.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_HAMILTONIANPART_HPP
 #define POMEROL_INCLUDE_POMEROL_HAMILTONIANPART_HPP
diff --git a/include/pomerol/HilbertSpace.hpp b/include/pomerol/HilbertSpace.hpp
index 6e353d56..d26a6e04 100644
--- a/include/pomerol/HilbertSpace.hpp
+++ b/include/pomerol/HilbertSpace.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/HilbertSpace.hpp
 /// \brief Hilbert space of a system and invariant subspaces of its Hamiltonian.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_HILBERTSPACE_HPP
 #define POMEROL_INCLUDE_POMEROL_HILBERTSPACE_HPP
diff --git a/include/pomerol/Index.hpp b/include/pomerol/Index.hpp
index 622b1eca..0bf0af84 100644
--- a/include/pomerol/Index.hpp
+++ b/include/pomerol/Index.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/Index.hpp
 /// \brief Combinations of single-particle indices.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_POMEROL_INDEX_HPP
diff --git a/include/pomerol/IndexClassification.hpp b/include/pomerol/IndexClassification.hpp
index d79812b9..3c5a98b7 100644
--- a/include/pomerol/IndexClassification.hpp
+++ b/include/pomerol/IndexClassification.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/IndexClassification.hpp
 /// \brief Classification of indices of fermionic creation/annihilation operators.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_INDEXCLASSIFICATION_HPP
 #define POMEROL_INCLUDE_POMEROL_INDEXCLASSIFICATION_HPP
diff --git a/include/pomerol/IndexContainer2.hpp b/include/pomerol/IndexContainer2.hpp
index 8d0a1b4c..32031b4f 100644
--- a/include/pomerol/IndexContainer2.hpp
+++ b/include/pomerol/IndexContainer2.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/IndexContainer2.hpp
 /// \brief A CRTP base for container types whose elements are addressable by
 /// two single-particle indices.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_INDEXCONTAINER2_HPP
 #define POMEROL_INCLUDE_POMEROL_INDEXCONTAINER2_HPP
diff --git a/include/pomerol/IndexContainer4.hpp b/include/pomerol/IndexContainer4.hpp
index 9779252e..bde68f37 100644
--- a/include/pomerol/IndexContainer4.hpp
+++ b/include/pomerol/IndexContainer4.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/IndexContainer4.hpp
 /// \brief A CRTP base for container types whose elements are addressable by
 /// four single-particle indices.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_INDEXCONTAINER4_HPP
 #define POMEROL_INCLUDE_POMEROL_INDEXCONTAINER4_HPP
diff --git a/include/pomerol/LatticePresets.hpp b/include/pomerol/LatticePresets.hpp
index 818bc540..5970c795 100644
--- a/include/pomerol/LatticePresets.hpp
+++ b/include/pomerol/LatticePresets.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/LatticePresets.hpp
 /// \brief Factory functions for terms commonly used to construct various lattice Hamiltonians.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_LATTICEPRESETS_HPP
 #define POMEROL_INCLUDE_POMEROL_LATTICEPRESETS_HPP
diff --git a/include/pomerol/MatsubaraContainers.hpp b/include/pomerol/MatsubaraContainers.hpp
index d36f9465..670af231 100644
--- a/include/pomerol/MatsubaraContainers.hpp
+++ b/include/pomerol/MatsubaraContainers.hpp
@@ -12,7 +12,7 @@
 /// \brief Container class designed to store values of functions of
 /// multiple fermionic Matsubara frequencies.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_POMEROL_MATSUBARACONTAINERS_HPP
 #define POMEROL_INCLUDE_POMEROL_MATSUBARACONTAINERS_HPP
diff --git a/include/pomerol/Misc.hpp b/include/pomerol/Misc.hpp
index 937cd7ed..e651b245 100644
--- a/include/pomerol/Misc.hpp
+++ b/include/pomerol/Misc.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/Misc.hpp
 /// \brief Declarations of the most basic types and macros.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_POMEROL_MISC_HPP
diff --git a/include/pomerol/MonomialOperator.hpp b/include/pomerol/MonomialOperator.hpp
index 80255721..58355136 100644
--- a/include/pomerol/MonomialOperator.hpp
+++ b/include/pomerol/MonomialOperator.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/MonomialOperator.hpp
 /// \brief Storage for an operator that is a product of creation/annihilation operators.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_MONOMIALOPERATOR_HPP
diff --git a/include/pomerol/MonomialOperatorPart.hpp b/include/pomerol/MonomialOperatorPart.hpp
index 99e17766..f04cf269 100644
--- a/include/pomerol/MonomialOperatorPart.hpp
+++ b/include/pomerol/MonomialOperatorPart.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/MonomialOperatorPart.hpp
 /// \brief Storage for a matrix block of an operator that is a product of creation/annihilation operators.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_MONOMIALOPERATORPART_HPP
 #define POMEROL_INCLUDE_MONOMIALOPERATORPART_HPP
diff --git a/include/pomerol/Operators.hpp b/include/pomerol/Operators.hpp
index 064fd92f..7be2417d 100644
--- a/include/pomerol/Operators.hpp
+++ b/include/pomerol/Operators.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/Operators.hpp
 /// \brief Expressions with quantum-mechanical operators and functions to construct them.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_OPERATORS_HPP
 #define POMEROL_INCLUDE_OPERATORS_HPP
diff --git a/include/pomerol/StatesClassification.hpp b/include/pomerol/StatesClassification.hpp
index a9dda3de..ce9ff383 100644
--- a/include/pomerol/StatesClassification.hpp
+++ b/include/pomerol/StatesClassification.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/StatesClassification.hpp
 /// \brief Classification of many-body basis states (Fock states) into subspaces.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_STATESCLASSIFICATION_HPP
 #define POMEROL_INCLUDE_STATESCLASSIFICATION_HPP
diff --git a/include/pomerol/Susceptibility.hpp b/include/pomerol/Susceptibility.hpp
index 242e2756..3371badb 100644
--- a/include/pomerol/Susceptibility.hpp
+++ b/include/pomerol/Susceptibility.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/Susceptibility.hpp
 /// \brief Dynamical susceptibility in the Matsubara representation.
 /// \author Junya Otsuki (j.otsuki@okayama-u.ac.jp)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_SUSCEPTIBILITY_HPP
diff --git a/include/pomerol/SusceptibilityPart.hpp b/include/pomerol/SusceptibilityPart.hpp
index 055e591b..f237a03f 100644
--- a/include/pomerol/SusceptibilityPart.hpp
+++ b/include/pomerol/SusceptibilityPart.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/SusceptibilityPart.hpp
 /// \brief Part of a dynamical susceptibility in the Matsubara representation.
 /// \author Junya Otsuki (j.otsuki@okayama-u.ac.jp)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_SUSCEPTIBILITYPART_HPP
diff --git a/include/pomerol/TermList.hpp b/include/pomerol/TermList.hpp
index 604c68a8..1cf7e307 100644
--- a/include/pomerol/TermList.hpp
+++ b/include/pomerol/TermList.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/TermList.hpp
 /// \brief List of terms forming Lehmann representation of a correlation function.
-/// \author Igor Krivenko (Igor.S.Krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_TERMLIST_HPP
 #define POMEROL_INCLUDE_TERMLIST_HPP
diff --git a/include/pomerol/Thermal.hpp b/include/pomerol/Thermal.hpp
index d7fa90b4..0f79e57d 100644
--- a/include/pomerol/Thermal.hpp
+++ b/include/pomerol/Thermal.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/Thermal.hpp
 /// \brief Objects, whose definition depends on the temperature.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_THERMAL_HPP
 #define POMEROL_INCLUDE_THERMAL_HPP
diff --git a/include/pomerol/ThreePointSusceptibility.hpp b/include/pomerol/ThreePointSusceptibility.hpp
index e757b1bd..0473ea91 100644
--- a/include/pomerol/ThreePointSusceptibility.hpp
+++ b/include/pomerol/ThreePointSusceptibility.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/ThreePointSusceptibility.hpp
 /// \brief 3-point susceptibility in the Matsubara representation.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_THREEPOINTSUSCEPTIBILITY_HPP
 #define POMEROL_INCLUDE_THREEPOINTSUSCEPTIBILITY_HPP
diff --git a/include/pomerol/ThreePointSusceptibilityContainer.hpp b/include/pomerol/ThreePointSusceptibilityContainer.hpp
index 5da61cbd..2cb0d3c9 100644
--- a/include/pomerol/ThreePointSusceptibilityContainer.hpp
+++ b/include/pomerol/ThreePointSusceptibilityContainer.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/ThreePointSusceptibilityContainer.hpp
 /// \brief Storage for multiple 3-point susceptibilities in the Matsubara representation.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_THREEPOINTSUSCEPTIBILITYCONTAINER_HPP
 #define POMEROL_INCLUDE_THREEPOINTSUSCEPTIBILITYCONTAINER_HPP
diff --git a/include/pomerol/ThreePointSusceptibilityPart.hpp b/include/pomerol/ThreePointSusceptibilityPart.hpp
index a0e5a846..6c6683f6 100644
--- a/include/pomerol/ThreePointSusceptibilityPart.hpp
+++ b/include/pomerol/ThreePointSusceptibilityPart.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/ThreePointSusceptibilityPart.hpp
 /// \brief Part of a 3-point susceptibility in the Matsubara representation.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_THREEPOINTSUSCEPTIBILITYPART_HPP
 #define POMEROL_INCLUDE_THREEPOINTSUSCEPTIBILITYPART_HPP
diff --git a/include/pomerol/TwoParticleGF.hpp b/include/pomerol/TwoParticleGF.hpp
index 16c40e3f..e8a83bf5 100644
--- a/include/pomerol/TwoParticleGF.hpp
+++ b/include/pomerol/TwoParticleGF.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/TwoParticleGF.hpp
 /// \brief Fermionic two-particle Matsubara Green's function.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_TWOPARTICLEGF_HPP
diff --git a/include/pomerol/TwoParticleGFContainer.hpp b/include/pomerol/TwoParticleGFContainer.hpp
index e6573fdd..89d31895 100644
--- a/include/pomerol/TwoParticleGFContainer.hpp
+++ b/include/pomerol/TwoParticleGFContainer.hpp
@@ -11,7 +11,7 @@
 /// \file include/pomerol/TwoParticleGFContainer.hpp
 /// \brief Storage for multiple fermionic two-particle Matsubara Green's functions.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_INCLUDE_TWOPARTICLEGFCONTAINER_HPP
 #define POMEROL_INCLUDE_TWOPARTICLEGFCONTAINER_HPP
diff --git a/include/pomerol/TwoParticleGFPart.hpp b/include/pomerol/TwoParticleGFPart.hpp
index 1775a8af..be9a7413 100644
--- a/include/pomerol/TwoParticleGFPart.hpp
+++ b/include/pomerol/TwoParticleGFPart.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/TwoParticleGFPart.hpp
 /// \brief Part of a fermionic two-particle Matsubara Green's function.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_TWOPARTICLEGFPART_HPP
diff --git a/include/pomerol/Version.hpp.in b/include/pomerol/Version.hpp.in
index 06158bf8..f5607b44 100644
--- a/include/pomerol/Version.hpp.in
+++ b/include/pomerol/Version.hpp.in
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/Version.hpp
 /// \brief Pomerol version information.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 /// \addtogroup Misc
 ///@{
diff --git a/include/pomerol/Vertex4.hpp b/include/pomerol/Vertex4.hpp
index ccb0385f..8cf1a8ff 100644
--- a/include/pomerol/Vertex4.hpp
+++ b/include/pomerol/Vertex4.hpp
@@ -10,7 +10,7 @@
 
 /// \file include/pomerol/Vertex4.hpp
 /// \brief Irreducible two-particle vertex in the Matsubara representation.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #ifndef POMEROL_INCLUDE_VERTEX4_HPP
diff --git a/prog/anderson_model.hpp b/prog/anderson_model.hpp
index f9c490ec..ff5e31aa 100644
--- a/prog/anderson_model.hpp
+++ b/prog/anderson_model.hpp
@@ -11,7 +11,7 @@
 /// \file prog/anderson_model.hpp
 /// \brief ED calculations for the Anderson impurity model.
 /// \author Sergei Iskakov (sir.iskakoff@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_PROG_ANDERSON_MODEL_HPP
 #define POMEROL_PROG_ANDERSON_MODEL_HPP
diff --git a/prog/hubbard2d_model.hpp b/prog/hubbard2d_model.hpp
index 78e8d8df..410622c2 100644
--- a/prog/hubbard2d_model.hpp
+++ b/prog/hubbard2d_model.hpp
@@ -11,7 +11,7 @@
 /// \file prog/hubbard2d_model.hpp
 /// \brief ED calculations for the two-dimensional Hubbard model on an MxM cluster.
 /// \author Sergei Iskakov (sir.iskakoff@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_PROG_HUBBARD2D_MODEL_HPP
 #define POMEROL_PROG_HUBBARD2D_MODEL_HPP
diff --git a/prog/quantum_model.cpp b/prog/quantum_model.cpp
index 67c2585b..d2dcde63 100644
--- a/prog/quantum_model.cpp
+++ b/prog/quantum_model.cpp
@@ -11,7 +11,7 @@
 /// \file prog/quantum_model.hpp
 /// \brief Base class for ED calculations of finite quantum many-body models (implementation).
 /// \author Sergei Iskakov (sir.iskakoff@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "quantum_model.hpp"
 
diff --git a/prog/quantum_model.hpp b/prog/quantum_model.hpp
index 0e6b7a18..f100bb67 100644
--- a/prog/quantum_model.hpp
+++ b/prog/quantum_model.hpp
@@ -11,7 +11,7 @@
 /// \file prog/quantum_model.hpp
 /// \brief Base class for ED calculations of finite quantum many-body models.
 /// \author Sergei Iskakov (sir.iskakoff@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_PROG_QUANTUM_MODEL_HPP
 #define POMEROL_PROG_QUANTUM_MODEL_HPP
diff --git a/src/mpi_dispatcher/mpi_dispatcher.cpp b/src/mpi_dispatcher/mpi_dispatcher.cpp
index 5bc12440..aaf39c70 100644
--- a/src/mpi_dispatcher/mpi_dispatcher.cpp
+++ b/src/mpi_dispatcher/mpi_dispatcher.cpp
@@ -11,7 +11,7 @@
 /// \file src/mpi_dispatcher/mpi_dispatcher.cpp
 /// \brief A master-worker parallelization scheme using non-blocking MPI communications (implementation).
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "mpi_dispatcher/mpi_dispatcher.hpp"
 #include "mpi_dispatcher/misc.hpp"
diff --git a/src/pomerol/DensityMatrix.cpp b/src/pomerol/DensityMatrix.cpp
index 5799d6f7..5424180e 100644
--- a/src/pomerol/DensityMatrix.cpp
+++ b/src/pomerol/DensityMatrix.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/DensityMatrix.cpp
 /// \brief Many-body Gibbs density matrix as a list of diagonal blocks (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/DensityMatrix.hpp"
diff --git a/src/pomerol/DensityMatrixPart.cpp b/src/pomerol/DensityMatrixPart.cpp
index 2a18a6e1..aef2205a 100644
--- a/src/pomerol/DensityMatrixPart.cpp
+++ b/src/pomerol/DensityMatrixPart.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/DensityMatrixPart.cpp
 /// \brief Diagonal block of a many-body Gibbs density matrix (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/DensityMatrixPart.hpp"
diff --git a/src/pomerol/EnsembleAverage.cpp b/src/pomerol/EnsembleAverage.cpp
index 0aacb723..91c7fc9e 100644
--- a/src/pomerol/EnsembleAverage.cpp
+++ b/src/pomerol/EnsembleAverage.cpp
@@ -11,7 +11,7 @@
 /// \file src/pomerol/EnsembleAverage.cpp
 /// \brief Ensemble average of a monomial operator representing a physical observable (implementation).
 /// \author Junya Otsuki (j.otsuki@okayama-u.ac.jp)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/EnsembleAverage.hpp"
diff --git a/src/pomerol/FieldOperatorContainer.cpp b/src/pomerol/FieldOperatorContainer.cpp
index 8e5efcdc..27a89dc6 100644
--- a/src/pomerol/FieldOperatorContainer.cpp
+++ b/src/pomerol/FieldOperatorContainer.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/FieldOperatorContainer.cpp
 /// \brief A container for creation and annihilation operators (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/FieldOperatorContainer.hpp"
diff --git a/src/pomerol/GFContainer.cpp b/src/pomerol/GFContainer.cpp
index c2e63c54..2e4a6953 100644
--- a/src/pomerol/GFContainer.cpp
+++ b/src/pomerol/GFContainer.cpp
@@ -11,7 +11,7 @@
 /// \file src/pomerol/GFContainer.cpp
 /// \brief Storage for multiple fermionic single-particle Matsubara Green's functions (implementation).
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/GFContainer.hpp"
 
diff --git a/src/pomerol/GreensFunction.cpp b/src/pomerol/GreensFunction.cpp
index 70a123fb..f0dce246 100644
--- a/src/pomerol/GreensFunction.cpp
+++ b/src/pomerol/GreensFunction.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/GreensFunction.cpp
 /// \brief Fermionic single-particle Matsubara Green's function (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/GreensFunction.hpp"
diff --git a/src/pomerol/GreensFunctionPart.cpp b/src/pomerol/GreensFunctionPart.cpp
index 7744ccd7..a0c55ae5 100644
--- a/src/pomerol/GreensFunctionPart.cpp
+++ b/src/pomerol/GreensFunctionPart.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/GreensFunctionPart.cpp
 /// \brief Part of a single-particle Matsubara Green's function (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/GreensFunctionPart.hpp"
diff --git a/src/pomerol/Hamiltonian.cpp b/src/pomerol/Hamiltonian.cpp
index bef65c9b..fed95754 100644
--- a/src/pomerol/Hamiltonian.cpp
+++ b/src/pomerol/Hamiltonian.cpp
@@ -11,7 +11,7 @@
 /// \file src/pomerol/Hamiltonian.cpp
 /// \brief Storage and diagonalization of a Hamiltonian matrix (implementation).
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/Hamiltonian.hpp"
 
diff --git a/src/pomerol/HamiltonianPart.cpp b/src/pomerol/HamiltonianPart.cpp
index 6447c2a8..e834da2b 100644
--- a/src/pomerol/HamiltonianPart.cpp
+++ b/src/pomerol/HamiltonianPart.cpp
@@ -11,7 +11,7 @@
 /// \file src/pomerol/HamiltonianPart.cpp
 /// \brief Storage and diagonalization of a Hamiltonian matrix block (implementation).
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/HamiltonianPart.hpp"
 
diff --git a/src/pomerol/LatticePresets.cpp b/src/pomerol/LatticePresets.cpp
index 9ba90ccb..13656adf 100644
--- a/src/pomerol/LatticePresets.cpp
+++ b/src/pomerol/LatticePresets.cpp
@@ -11,7 +11,7 @@
 /// \file src/pomerol/LatticePresets.cpp
 /// \brief Factory functions for terms commonly used to construct various lattice Hamiltonians (implementation).
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/LatticePresets.hpp"
 
diff --git a/src/pomerol/Misc.cpp b/src/pomerol/Misc.cpp
index 02b0c2db..21a92a01 100644
--- a/src/pomerol/Misc.cpp
+++ b/src/pomerol/Misc.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/Misc.cpp
 /// \brief Implementation of functions and methods from Misc.hpp
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/Misc.hpp"
diff --git a/src/pomerol/MonomialOperator.cpp b/src/pomerol/MonomialOperator.cpp
index b5625e15..372a6852 100644
--- a/src/pomerol/MonomialOperator.cpp
+++ b/src/pomerol/MonomialOperator.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/MonomialOperator.cpp
 /// \brief Storage for an operator that is a product of creation/annihilation operators (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/MonomialOperator.hpp"
diff --git a/src/pomerol/MonomialOperatorPart.cpp b/src/pomerol/MonomialOperatorPart.cpp
index d2c63882..476009c2 100644
--- a/src/pomerol/MonomialOperatorPart.cpp
+++ b/src/pomerol/MonomialOperatorPart.cpp
@@ -12,7 +12,7 @@
 /// \brief Storage for a matrix block of an operator that is a product of creation/annihilation operators
 ///        (implementation).
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/MonomialOperatorPart.hpp"
 
diff --git a/src/pomerol/StatesClassification.cpp b/src/pomerol/StatesClassification.cpp
index a84a786b..f4e76bac 100644
--- a/src/pomerol/StatesClassification.cpp
+++ b/src/pomerol/StatesClassification.cpp
@@ -11,7 +11,7 @@
 /// \file src/pomerol/StatesClassification.cpp
 /// \brief Classification of many-body basis states (Fock states) into subspaces (implementation).
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/StatesClassification.hpp"
 
diff --git a/src/pomerol/Susceptibility.cpp b/src/pomerol/Susceptibility.cpp
index 5bcfed50..956057c3 100644
--- a/src/pomerol/Susceptibility.cpp
+++ b/src/pomerol/Susceptibility.cpp
@@ -11,7 +11,7 @@
 /// \file src/pomerol/Susceptibility.cpp
 /// \brief Dynamical susceptibility in the Matsubara representation (implementation).
 /// \author Junya Otsuki (j.otsuki@okayama-u.ac.jp)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/Susceptibility.hpp"
diff --git a/src/pomerol/SusceptibilityPart.cpp b/src/pomerol/SusceptibilityPart.cpp
index 05ad83b7..aa7c04fd 100644
--- a/src/pomerol/SusceptibilityPart.cpp
+++ b/src/pomerol/SusceptibilityPart.cpp
@@ -11,7 +11,7 @@
 /// \file src/pomerol/SusceptibilityPart.cpp
 /// \brief Part of a dynamical susceptibility in the Matsubara representation (implementation).
 /// \author Junya Otsuki (j.otsuki@okayama-u.ac.jp)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/SusceptibilityPart.hpp"
diff --git a/src/pomerol/ThreePointSusceptibility.cpp b/src/pomerol/ThreePointSusceptibility.cpp
index 4acc9d0c..e9db3820 100644
--- a/src/pomerol/ThreePointSusceptibility.cpp
+++ b/src/pomerol/ThreePointSusceptibility.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/ThreePointSusceptibility.cpp
 /// \brief 3-point susceptibility in the Matsubara representation (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/ThreePointSusceptibility.hpp"
 
diff --git a/src/pomerol/ThreePointSusceptibilityContainer.cpp b/src/pomerol/ThreePointSusceptibilityContainer.cpp
index 9be162e4..3f9ab4ca 100644
--- a/src/pomerol/ThreePointSusceptibilityContainer.cpp
+++ b/src/pomerol/ThreePointSusceptibilityContainer.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/ThreePointSusceptibilityContainer.cpp
 /// \brief Storage for multiple 3-point susceptibilities in the Matsubara representation (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/ThreePointSusceptibilityContainer.hpp"
 
diff --git a/src/pomerol/ThreePointSusceptibilityPart.cpp b/src/pomerol/ThreePointSusceptibilityPart.cpp
index b3b28c47..9da026a2 100644
--- a/src/pomerol/ThreePointSusceptibilityPart.cpp
+++ b/src/pomerol/ThreePointSusceptibilityPart.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/ThreePointSusceptibilityPart.cpp
 /// \brief Part of a 3-point susceptibility in the Matsubara representation (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/ThreePointSusceptibilityPart.hpp"
 #include "pomerol/ChaseIndices.hpp"
diff --git a/src/pomerol/TwoParticleGF.cpp b/src/pomerol/TwoParticleGF.cpp
index f1dc399f..b7475373 100644
--- a/src/pomerol/TwoParticleGF.cpp
+++ b/src/pomerol/TwoParticleGF.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/TwoParticleGF.cpp
 /// \brief Fermionic two-particle Matsubara Green's function (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/TwoParticleGF.hpp"
diff --git a/src/pomerol/TwoParticleGFContainer.cpp b/src/pomerol/TwoParticleGFContainer.cpp
index 259c1078..276bfe8d 100644
--- a/src/pomerol/TwoParticleGFContainer.cpp
+++ b/src/pomerol/TwoParticleGFContainer.cpp
@@ -11,7 +11,7 @@
 /// \file src/pomerol/TwoParticleGFContainer.cpp
 /// \brief Storage for multiple fermionic two-particle Matsubara Green's functions (implementation).
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include "pomerol/TwoParticleGFContainer.hpp"
 
diff --git a/src/pomerol/TwoParticleGFPart.cpp b/src/pomerol/TwoParticleGFPart.cpp
index 6db85bd7..7334c3cb 100644
--- a/src/pomerol/TwoParticleGFPart.cpp
+++ b/src/pomerol/TwoParticleGFPart.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/TwoParticleGFPart.cpp
 /// \brief Part of a fermionic two-particle Matsubara Green's function (implementation).
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/TwoParticleGFPart.hpp"
diff --git a/src/pomerol/Vertex4.cpp b/src/pomerol/Vertex4.cpp
index b8fb9a71..464fcdef 100644
--- a/src/pomerol/Vertex4.cpp
+++ b/src/pomerol/Vertex4.cpp
@@ -10,7 +10,7 @@
 
 /// \file src/pomerol/Vertex4.cpp
 /// \brief Irreducible two-particle vertex in the Matsubara representation.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
 
 #include "pomerol/Vertex4.hpp"
diff --git a/test/3PSusc1siteTest.cpp b/test/3PSusc1siteTest.cpp
index 5aaa6ed2..77c64bed 100644
--- a/test/3PSusc1siteTest.cpp
+++ b/test/3PSusc1siteTest.cpp
@@ -10,7 +10,7 @@
 
 /// \file test/3PSusc1siteTest.cpp
 /// \brief 3-point susceptibilities of a single Hubbard atom.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/FieldOperatorContainer.hpp>
diff --git a/test/3PSusc3siteTest.cpp b/test/3PSusc3siteTest.cpp
index a7d501df..50f65789 100644
--- a/test/3PSusc3siteTest.cpp
+++ b/test/3PSusc3siteTest.cpp
@@ -10,7 +10,7 @@
 
 /// \file test/3PSusc3siteTest.cpp
 /// \brief 3-point susceptibilities of a small Hubbard cluster.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/FieldOperatorContainer.hpp>
diff --git a/test/Anderson2PGFTest.cpp b/test/Anderson2PGFTest.cpp
index 3b644ff4..eec99dde 100644
--- a/test/Anderson2PGFTest.cpp
+++ b/test/Anderson2PGFTest.cpp
@@ -11,7 +11,7 @@
 /// \file test/Anderson2PGFTest.cpp
 /// \brief Two-particle Green's function of the Anderson impurity model.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/FieldOperatorContainer.hpp>
diff --git a/test/AndersonComplexTest.cpp b/test/AndersonComplexTest.cpp
index 01d4252c..51ff5580 100644
--- a/test/AndersonComplexTest.cpp
+++ b/test/AndersonComplexTest.cpp
@@ -10,7 +10,7 @@
 
 /// \file test/AndersonComplexTest.cpp
 /// \brief Single-particle Green's functions of a Hubbard atom with a complex spin-flipping term.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/FieldOperatorContainer.hpp>
diff --git a/test/AndersonTest.cpp b/test/AndersonTest.cpp
index e5e436fe..d825f54d 100644
--- a/test/AndersonTest.cpp
+++ b/test/AndersonTest.cpp
@@ -11,7 +11,7 @@
 /// \file test/AndersonTest.cpp
 /// \brief Single-particle Green's functions of the Anderson impurity model.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/FieldOperatorContainer.hpp>
diff --git a/test/BroadcastTest.cpp b/test/BroadcastTest.cpp
index 9744f450..0cedbcdd 100644
--- a/test/BroadcastTest.cpp
+++ b/test/BroadcastTest.cpp
@@ -10,7 +10,7 @@
 
 /// \file test/BroadcastTest.cpp
 /// \brief Test the MPI broadcast operation for various types.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <mpi_dispatcher/misc.hpp>
 
diff --git a/test/GF1siteTest.cpp b/test/GF1siteTest.cpp
index 71cb4285..a975f579 100644
--- a/test/GF1siteTest.cpp
+++ b/test/GF1siteTest.cpp
@@ -11,7 +11,7 @@
 /// \file test/GF1siteTest.cpp
 /// \brief Single-particle Green's functions of a single Hubbard atom.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/FieldOperatorContainer.hpp>
diff --git a/test/GF2siteTest.cpp b/test/GF2siteTest.cpp
index 13b70129..6c8ddbbc 100644
--- a/test/GF2siteTest.cpp
+++ b/test/GF2siteTest.cpp
@@ -11,7 +11,7 @@
 /// \file test/GF2siteTest.cpp
 /// \brief Single-particle Green's functions of a Hubbard dimer.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/FieldOperatorContainer.hpp>
diff --git a/test/GF4siteTest.cpp b/test/GF4siteTest.cpp
index 2b9f5b22..748aa089 100644
--- a/test/GF4siteTest.cpp
+++ b/test/GF4siteTest.cpp
@@ -11,7 +11,7 @@
 /// \file test/GF4siteTest.cpp
 /// \brief Single-particle Green's functions of a Hubbard 2x2 plaquette.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/FieldOperatorContainer.hpp>
diff --git a/test/HamiltonianBosonsTest.cpp b/test/HamiltonianBosonsTest.cpp
index 2b344086..96ff574b 100644
--- a/test/HamiltonianBosonsTest.cpp
+++ b/test/HamiltonianBosonsTest.cpp
@@ -10,7 +10,7 @@
 
 /// \file test/HamiltonianBosonsTest.cpp
 /// \brief Diagonalization of a Hubbard atom coupled to a boson.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/Hamiltonian.hpp>
 #include <pomerol/HilbertSpace.hpp>
diff --git a/test/HamiltonianTest.cpp b/test/HamiltonianTest.cpp
index 1399aaa3..5468abe0 100644
--- a/test/HamiltonianTest.cpp
+++ b/test/HamiltonianTest.cpp
@@ -11,7 +11,7 @@
 /// \file test/HamiltonianTest.cpp
 /// \brief Diagonalization of a Hubbard dimer.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/Hamiltonian.hpp>
 #include <pomerol/HamiltonianPart.hpp>
diff --git a/test/MPIDispatcherTest.cpp b/test/MPIDispatcherTest.cpp
index 3e36fdc2..c007c685 100644
--- a/test/MPIDispatcherTest.cpp
+++ b/test/MPIDispatcherTest.cpp
@@ -11,7 +11,7 @@
 /// \file test/MPIDispatcherTest.cpp
 /// \brief Test the MPIMaster/MPIWorker communication mechanism.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <mpi_dispatcher/misc.hpp>
 #include <mpi_dispatcher/mpi_dispatcher.hpp>
diff --git a/test/SusceptibilityTest.cpp b/test/SusceptibilityTest.cpp
index 710e431e..e4291b80 100644
--- a/test/SusceptibilityTest.cpp
+++ b/test/SusceptibilityTest.cpp
@@ -11,7 +11,7 @@
 /// \file test/SusceptibilityTest.cpp
 /// \brief Susceptibilities of a single Hubbard atom.
 /// \author Junya Otsuki (j.otsuki@okayama-u.ac.jp)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/EnsembleAverage.hpp>
diff --git a/test/Vertex4Test.cpp b/test/Vertex4Test.cpp
index 8c8e2750..1abbccf5 100644
--- a/test/Vertex4Test.cpp
+++ b/test/Vertex4Test.cpp
@@ -11,7 +11,7 @@
 /// \file test/Vertex4Test.cpp
 /// \brief Two-particle Green's function and the vertex of a single Hubbard atom.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #include <pomerol/DensityMatrix.hpp>
 #include <pomerol/FieldOperatorContainer.hpp>
diff --git a/test/catch2/catch-pomerol.hpp b/test/catch2/catch-pomerol.hpp
index 1b7c7829..9151a5f7 100644
--- a/test/catch2/catch-pomerol.hpp
+++ b/test/catch2/catch-pomerol.hpp
@@ -10,7 +10,7 @@
 
 /// \file test/catch2/catch-pomerol.hpp
 /// \brief Supporting types and functions for Catch2
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #ifndef POMEROL_TEST_CATCH2_CATCH_POMEROL_HPP
 #define POMEROL_TEST_CATCH2_CATCH_POMEROL_HPP
diff --git a/test/catch2/catch2-main.cpp b/test/catch2/catch2-main.cpp
index 3a97dec5..800ca822 100644
--- a/test/catch2/catch2-main.cpp
+++ b/test/catch2/catch2-main.cpp
@@ -10,7 +10,7 @@
 
 /// \file test/catch2/catch2-main.cpp
 /// \brief User-provided main() for Catch2 that takes care of MPI initialization/finalization.
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 #define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
diff --git a/tutorial/example2site.cpp b/tutorial/example2site.cpp
index b3170ab4..914625f0 100644
--- a/tutorial/example2site.cpp
+++ b/tutorial/example2site.cpp
@@ -11,7 +11,7 @@
 /// \file tutorial/example2site.cpp
 /// \brief An example of how to use the pomerol library.
 /// \author Andrey Antipov (andrey.e.antipov@gmail.com)
-/// \author Igor Krivenko (igor.s.krivenko@gmail.com)
+/// \author Igor Krivenko
 
 // In this file we provide a tutorial example of how to actually use the pomerol library.