gnuastro-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnuastro-commits] master 45bd003 049/113: Imported recent work in maste


From: Mohammad Akhlaghi
Subject: [gnuastro-commits] master 45bd003 049/113: Imported recent work in master, conflicts fixed
Date: Fri, 16 Apr 2021 10:33:43 -0400 (EDT)

branch: master
commit 45bd003179d02bafc8c0b5f581bd353f11638f60
Merge: 303e6e2 53a9555
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>

    Imported recent work in master, conflicts fixed
    
    Two conflicts came up in `tests/prepconf.sh' (regarding the new feature to
    build the configuration file of BuildProgram) and
    `bin/mkcatalog/mkcatalog.c' (regarding checking the return value of
    `asprintf'). Both are now corrected.
    
    Also a minor typo of (`to' that should have been `two') was corrected in
    the manual where we discuss building 3D kernels with MakeProfiles.
---
 Makefile.am                                        |   4 +-
 NEWS                                               |  18 +++
 THANKS                                             |   3 +
 bin/arithmetic/Makefile.am                         |   4 +-
 bin/arithmetic/args.h                              |   4 +-
 bin/arithmetic/arithmetic.c                        |   4 +-
 bin/arithmetic/arithmetic.h                        |   4 +-
 bin/arithmetic/authors-cite.h                      |   4 +-
 bin/arithmetic/main.c                              |   4 +-
 bin/arithmetic/main.h                              |   4 +-
 bin/arithmetic/operands.c                          |   4 +-
 bin/arithmetic/operands.h                          |   4 +-
 bin/arithmetic/ui.c                                |   4 +-
 bin/arithmetic/ui.h                                |   4 +-
 bin/buildprog/Makefile.am                          |  45 +++++-
 bin/buildprog/args.h                               |   4 +-
 .../{astbuildprog.conf => astbuildprog.conf.in}    |   0
 bin/buildprog/authors-cite.h                       |   4 +-
 bin/buildprog/buildprog.c                          |  57 +++++---
 bin/buildprog/buildprog.h                          |   4 +-
 bin/buildprog/main.c                               |   4 +-
 bin/buildprog/main.h                               |   4 +-
 bin/buildprog/ui.c                                 |   4 +-
 bin/buildprog/ui.h                                 |   4 +-
 bin/convertt/Makefile.am                           |   4 +-
 bin/convertt/args.h                                |   4 +-
 bin/convertt/authors-cite.h                        |   4 +-
 bin/convertt/convertt.c                            |   4 +-
 bin/convertt/convertt.h                            |   4 +-
 bin/convertt/eps.c                                 |   4 +-
 bin/convertt/eps.h                                 |   4 +-
 bin/convertt/jpeg.c                                |   7 +-
 bin/convertt/jpeg.h                                |   4 +-
 bin/convertt/main.c                                |   4 +-
 bin/convertt/main.h                                |   4 +-
 bin/convertt/ui.c                                  |   7 +-
 bin/convertt/ui.h                                  |   4 +-
 bin/convolve/Makefile.am                           |   4 +-
 bin/convolve/args.h                                |   4 +-
 bin/convolve/authors-cite.h                        |   4 +-
 bin/convolve/convolve.c                            |   4 +-
 bin/convolve/convolve.h                            |   4 +-
 bin/convolve/main.c                                |   4 +-
 bin/convolve/main.h                                |   4 +-
 bin/convolve/ui.c                                  |   4 +-
 bin/convolve/ui.h                                  |   4 +-
 bin/cosmiccal/Makefile.am                          |   4 +-
 bin/cosmiccal/args.h                               |   4 +-
 bin/cosmiccal/authors-cite.h                       |   4 +-
 bin/cosmiccal/cosmiccal.c                          |   4 +-
 bin/cosmiccal/cosmiccal.h                          |   4 +-
 bin/cosmiccal/main.c                               |   4 +-
 bin/cosmiccal/main.h                               |   4 +-
 bin/cosmiccal/ui.c                                 |   4 +-
 bin/cosmiccal/ui.h                                 |   4 +-
 bin/crop/Makefile.am                               |   4 +-
 bin/crop/args.h                                    |   4 +-
 bin/crop/authors-cite.h                            |   4 +-
 bin/crop/crop.c                                    |  38 +++--
 bin/crop/crop.h                                    |   4 +-
 bin/crop/main.c                                    |   4 +-
 bin/crop/main.h                                    |   4 +-
 bin/crop/onecrop.c                                 |  14 +-
 bin/crop/onecrop.h                                 |   4 +-
 bin/crop/ui.c                                      |  19 +--
 bin/crop/ui.h                                      |   4 +-
 bin/crop/wcsmode.c                                 |   4 +-
 bin/crop/wcsmode.h                                 |   4 +-
 bin/fits/Makefile.am                               |   4 +-
 bin/fits/args.h                                    |   4 +-
 bin/fits/authors-cite.h                            |   4 +-
 bin/fits/extension.c                               |   4 +-
 bin/fits/extension.h                               |   4 +-
 bin/fits/fits.c                                    |   7 +-
 bin/fits/fits.h                                    |   4 +-
 bin/fits/keywords.c                                |   4 +-
 bin/fits/keywords.h                                |   4 +-
 bin/fits/main.c                                    |   4 +-
 bin/fits/main.h                                    |   4 +-
 bin/fits/ui.c                                      |   4 +-
 bin/fits/ui.h                                      |   4 +-
 bin/match/Makefile.am                              |   4 +-
 bin/match/args.h                                   |   4 +-
 bin/match/authors-cite.h                           |   4 +-
 bin/match/main.c                                   |   4 +-
 bin/match/main.h                                   |   4 +-
 bin/match/match.c                                  |   4 +-
 bin/match/match.h                                  |   4 +-
 bin/match/ui.c                                     |   4 +-
 bin/match/ui.h                                     |   4 +-
 bin/mkcatalog/Makefile.am                          |   4 +-
 bin/mkcatalog/args.h                               |   4 +-
 bin/mkcatalog/authors-cite.h                       |   4 +-
 bin/mkcatalog/columns.c                            |   4 +-
 bin/mkcatalog/columns.h                            |   4 +-
 bin/mkcatalog/main.c                               |   4 +-
 bin/mkcatalog/main.h                               |   4 +-
 bin/mkcatalog/mkcatalog.c                          | 158 +++++++++++++--------
 bin/mkcatalog/mkcatalog.h                          |   4 +-
 bin/mkcatalog/ui.c                                 |  32 +++--
 bin/mkcatalog/ui.h                                 |   4 +-
 bin/mkcatalog/upperlimit.c                         |   4 +-
 bin/mkcatalog/upperlimit.h                         |   4 +-
 bin/mknoise/Makefile.am                            |   2 +-
 bin/mknoise/args.h                                 |   4 +-
 bin/mknoise/authors-cite.h                         |   4 +-
 bin/mknoise/main.c                                 |   4 +-
 bin/mknoise/main.h                                 |   4 +-
 bin/mknoise/mknoise.c                              |   4 +-
 bin/mknoise/mknoise.h                              |   4 +-
 bin/mknoise/ui.c                                   |   4 +-
 bin/mknoise/ui.h                                   |   4 +-
 bin/mkprof/Makefile.am                             |   4 +-
 bin/mkprof/args.h                                  |   4 +-
 bin/mkprof/authors-cite.h                          |   4 +-
 bin/mkprof/main.c                                  |   4 +-
 bin/mkprof/main.h                                  |   4 +-
 bin/mkprof/mkprof.c                                |  21 +--
 bin/mkprof/mkprof.h                                |   4 +-
 bin/mkprof/oneprofile.c                            |   4 +-
 bin/mkprof/oneprofile.h                            |   4 +-
 bin/mkprof/profiles.c                              |   4 +-
 bin/mkprof/profiles.h                              |   4 +-
 bin/mkprof/ui.c                                    |  47 ++++--
 bin/mkprof/ui.h                                    |   4 +-
 bin/noisechisel/Makefile.am                        |   4 +-
 bin/noisechisel/args.h                             |   4 +-
 bin/noisechisel/authors-cite.h                     |   4 +-
 bin/noisechisel/clumps.c                           |   9 +-
 bin/noisechisel/clumps.h                           |   4 +-
 bin/noisechisel/detection.c                        |  54 ++++---
 bin/noisechisel/detection.h                        |   4 +-
 bin/noisechisel/main.c                             |   4 +-
 bin/noisechisel/main.h                             |   4 +-
 bin/noisechisel/noisechisel.c                      |   4 +-
 bin/noisechisel/noisechisel.h                      |   4 +-
 bin/noisechisel/segmentation.c                     |  58 +++++---
 bin/noisechisel/segmentation.h                     |   4 +-
 bin/noisechisel/sky.c                              |   4 +-
 bin/noisechisel/sky.h                              |   4 +-
 bin/noisechisel/threshold.c                        |   9 +-
 bin/noisechisel/threshold.h                        |   4 +-
 bin/noisechisel/ui.c                               |  16 ++-
 bin/noisechisel/ui.h                               |   4 +-
 bin/statistics/Makefile.am                         |   4 +-
 bin/statistics/args.h                              |   4 +-
 bin/statistics/authors-cite.h                      |   4 +-
 bin/statistics/main.c                              |   4 +-
 bin/statistics/main.h                              |   4 +-
 bin/statistics/sky.c                               |   9 +-
 bin/statistics/sky.h                               |   4 +-
 bin/statistics/statistics.c                        |  39 +++--
 bin/statistics/statistics.h                        |   4 +-
 bin/statistics/ui.c                                |  19 ++-
 bin/statistics/ui.h                                |   4 +-
 bin/table/Makefile.am                              |   4 +-
 bin/table/args.h                                   |   4 +-
 bin/table/authors-cite.h                           |   4 +-
 bin/table/main.c                                   |   4 +-
 bin/table/main.h                                   |   4 +-
 bin/table/table.c                                  |   4 +-
 bin/table/table.h                                  |   4 +-
 bin/table/ui.c                                     |   4 +-
 bin/table/ui.h                                     |   4 +-
 bin/warp/Makefile.am                               |   4 +-
 bin/warp/args.h                                    |   4 +-
 bin/warp/authors-cite.h                            |   4 +-
 bin/warp/main.c                                    |   4 +-
 bin/warp/main.h                                    |   4 +-
 bin/warp/ui.c                                      |   4 +-
 bin/warp/ui.h                                      |   4 +-
 bin/warp/warp.c                                    |   4 +-
 bin/warp/warp.h                                    |   4 +-
 bootstrap.conf                                     |   4 +-
 configure.ac                                       |  16 ++-
 doc/Makefile.am                                    |   4 +-
 doc/announce-acknowledge.txt                       |   3 +
 doc/fonts.css                                      |   4 +-
 doc/forwebpage                                     |   4 +-
 doc/genauthors                                     |   4 +-
 doc/gnuastro.en.html                               |  33 +++++
 doc/gnuastro.fr.html                               |   4 +-
 doc/gnuastro.texi                                  |  92 ++++++++----
 doc/plotsrc/Makefile                               |   4 +-
 doc/plotsrc/all.tex                                |   4 +-
 doc/plotsrc/conversions.sh                         |   4 +-
 doc/plotsrc/tex/flatplane.tex                      |   4 +-
 doc/plotsrc/tex/iandtime.tex                       |   4 +-
 doc/plotsrc/tex/samplingfreq.tex                   |   4 +-
 doc/plotsrc/tex/sphereandplane.tex                 |   4 +-
 doc/release-checklist.txt                          |  18 ++-
 doc/style.css                                      |   4 +-
 genauthors                                         |   4 +-
 lib/Makefile.am                                    |   4 +-
 lib/arithmetic-and.c                               |   4 +-
 lib/arithmetic-bitand.c                            |   4 +-
 lib/arithmetic-bitlsh.c                            |   4 +-
 lib/arithmetic-bitor.c                             |   4 +-
 lib/arithmetic-bitrsh.c                            |   4 +-
 lib/arithmetic-bitxor.c                            |   4 +-
 lib/arithmetic-divide.c                            |   4 +-
 lib/arithmetic-eq.c                                |   4 +-
 lib/arithmetic-ge.c                                |   4 +-
 lib/arithmetic-gt.c                                |   4 +-
 lib/arithmetic-le.c                                |   4 +-
 lib/arithmetic-lt.c                                |   4 +-
 lib/arithmetic-minus.c                             |   4 +-
 lib/arithmetic-modulo.c                            |   4 +-
 lib/arithmetic-multiply.c                          |   4 +-
 lib/arithmetic-ne.c                                |   4 +-
 lib/arithmetic-or.c                                |   4 +-
 lib/arithmetic-plus.c                              |   4 +-
 lib/arithmetic.c                                   |   4 +-
 lib/binary.c                                       |   4 +-
 lib/blank.c                                        | 136 ++++++++++++++----
 lib/box.c                                          |   4 +-
 lib/checkset.c                                     |   9 +-
 lib/convolve.c                                     |   4 +-
 lib/cosmology.c                                    |   4 +-
 lib/data.c                                         |  16 ++-
 lib/dimension.c                                    |   4 +-
 lib/fits.c                                         |  48 +++++--
 lib/git.c                                          |   4 +-
 lib/gnuastro-internal/arithmetic-and.h             |   4 +-
 lib/gnuastro-internal/arithmetic-binary.h          |   4 +-
 lib/gnuastro-internal/arithmetic-bitand.h          |   4 +-
 lib/gnuastro-internal/arithmetic-bitlsh.h          |   4 +-
 lib/gnuastro-internal/arithmetic-bitor.h           |   4 +-
 lib/gnuastro-internal/arithmetic-bitrsh.h          |   4 +-
 lib/gnuastro-internal/arithmetic-bitxor.h          |   4 +-
 lib/gnuastro-internal/arithmetic-divide.h          |   4 +-
 lib/gnuastro-internal/arithmetic-eq.h              |   4 +-
 lib/gnuastro-internal/arithmetic-ge.h              |   4 +-
 lib/gnuastro-internal/arithmetic-gt.h              |   4 +-
 lib/gnuastro-internal/arithmetic-internal.h        |   4 +-
 lib/gnuastro-internal/arithmetic-le.h              |   4 +-
 lib/gnuastro-internal/arithmetic-lt.h              |   4 +-
 lib/gnuastro-internal/arithmetic-minus.h           |   4 +-
 lib/gnuastro-internal/arithmetic-modulo.h          |   4 +-
 lib/gnuastro-internal/arithmetic-multiply.h        |   4 +-
 lib/gnuastro-internal/arithmetic-ne.h              |   4 +-
 lib/gnuastro-internal/arithmetic-or.h              |   4 +-
 lib/gnuastro-internal/arithmetic-plus.h            |   4 +-
 lib/gnuastro-internal/checkset.h                   |   4 +-
 lib/gnuastro-internal/commonopts.h                 |   4 +-
 lib/gnuastro-internal/config.h.in                  |   4 +-
 lib/gnuastro-internal/fixedstringmacros.h          |   6 +-
 lib/gnuastro-internal/options.h                    |   4 +-
 lib/gnuastro-internal/tableintern.h                |   4 +-
 lib/gnuastro-internal/timing.h                     |   4 +-
 lib/gnuastro/arithmetic.h                          |   4 +-
 lib/gnuastro/binary.h                              |   4 +-
 lib/gnuastro/blank.h                               |   4 +-
 lib/gnuastro/box.h                                 |   4 +-
 lib/gnuastro/convolve.h                            |   4 +-
 lib/gnuastro/cosmology.h                           |   4 +-
 lib/gnuastro/data.h                                |   4 +-
 lib/gnuastro/dimension.h                           |   4 +-
 lib/gnuastro/fits.h                                |   4 +-
 lib/gnuastro/git.h                                 |   4 +-
 lib/gnuastro/interpolate.h                         |   4 +-
 lib/gnuastro/list.h                                |   4 +-
 lib/gnuastro/match.h                               |   4 +-
 lib/gnuastro/permutation.h                         |   4 +-
 lib/gnuastro/polygon.h                             |   4 +-
 lib/gnuastro/qsort.h                               |   4 +-
 lib/gnuastro/statistics.h                          |   4 +-
 lib/gnuastro/table.h                               |   4 +-
 lib/gnuastro/threads.h                             |   4 +-
 lib/gnuastro/tile.h                                |   4 +-
 lib/gnuastro/txt.h                                 |   4 +-
 lib/gnuastro/type.h                                |   4 +-
 lib/gnuastro/wcs.h                                 |   4 +-
 lib/interpolate.c                                  |   4 +-
 lib/list.c                                         |   4 +-
 lib/match.c                                        |   4 +-
 lib/options.c                                      |  56 +++++---
 lib/permutation.c                                  |   4 +-
 lib/polygon.c                                      |   4 +-
 lib/qsort.c                                        |   4 +-
 lib/statistics.c                                   |   4 +-
 lib/table.c                                        |  16 ++-
 lib/tableintern.c                                  |  12 +-
 lib/threads.c                                      |   4 +-
 lib/tile.c                                         |   4 +-
 lib/timing.c                                       |   4 +-
 lib/txt.c                                          |   7 +-
 lib/type.c                                         |  24 +++-
 lib/wcs.c                                          |   4 +-
 tests/Makefile.am                                  |   5 +-
 tests/arithmetic/onlynumbers.sh                    |   2 +-
 tests/arithmetic/or.sh                             |   2 +-
 tests/arithmetic/snimage.sh                        |   2 +-
 tests/arithmetic/where.sh                          |   2 +-
 tests/buildprog/simpleio.c                         |   4 +-
 tests/buildprog/simpleio.sh                        |   2 +-
 tests/convertt/blankch.sh                          |   2 +-
 tests/convertt/fitstojpeg.sh                       |   2 +-
 tests/convertt/fitstojpegcmyk.sh                   |   2 +-
 tests/convertt/fitstopdf.sh                        |   2 +-
 tests/convertt/fitstotxt.sh                        |   2 +-
 tests/convertt/jpegtofits.sh                       |   2 +-
 tests/convertt/jpegtotxt.sh                        |   2 +-
 tests/convolve/frequency.sh                        |   2 +-
 tests/convolve/spatial.sh                          |   2 +-
 tests/cosmiccal/simpletest.sh                      |   2 +-
 tests/crop/imgcat.sh                               |   2 +-
 tests/crop/imgcenter.sh                            |   2 +-
 tests/crop/imgcenternoblank.sh                     |   2 +-
 tests/crop/imgoutpolygon.sh                        |   2 +-
 tests/crop/imgpolygon.sh                           |   2 +-
 tests/crop/section.sh                              |   2 +-
 tests/crop/wcscat.sh                               |   2 +-
 tests/crop/wcscenter.sh                            |   2 +-
 tests/crop/wcspolygon.sh                           |   2 +-
 tests/during-dev.sh                                |   4 +-
 tests/fits/copyhdu.sh                              |   2 +-
 tests/fits/delete.sh                               |   2 +-
 tests/fits/print.sh                                |   2 +-
 tests/fits/update.sh                               |   2 +-
 tests/fits/write.sh                                |   2 +-
 tests/lib/multithread.c                            |   4 +-
 tests/lib/multithread.sh                           |   2 +-
 tests/lib/versioncxx.cpp                           |   4 +-
 tests/lib/versioncxx.sh                            |   2 +-
 tests/match/merged-cols.sh                         |   2 +-
 tests/match/positions.sh                           |   2 +-
 tests/mkcatalog/aperturephot.sh                    |   2 +-
 tests/mkcatalog/simple.sh                          |   2 +-
 tests/mknoise/addnoise.sh                          |   2 +-
 tests/mkprof/clearcanvas.sh                        |   2 +-
 tests/mkprof/ellipticalmasks.sh                    |   2 +-
 tests/mkprof/mosaic1.sh                            |   2 +-
 tests/mkprof/mosaic2.sh                            |   2 +-
 tests/mkprof/mosaic3.sh                            |   2 +-
 tests/mkprof/mosaic4.sh                            |   2 +-
 tests/mkprof/radeccat.sh                           |   2 +-
 tests/noisechisel/noisechisel.sh                   |   2 +-
 tests/prepconf.sh                                  |  24 ++--
 tests/statistics/basicstats.sh                     |   2 +-
 tests/statistics/estimate_sky.sh                   |   2 +-
 tests/table/fits-ascii-to-txt.sh                   |   2 +-
 tests/table/fits-binary-to-txt.sh                  |   2 +-
 tests/table/txt-to-fits-ascii.sh                   |   2 +-
 tests/table/txt-to-fits-binary.sh                  |   2 +-
 tests/warp/homographic.sh                          |   2 +-
 tests/warp/warp_scale.sh                           |   2 +-
 tmpfs-config-make                                  |   4 +-
 348 files changed, 1402 insertions(+), 931 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 80a01b4..f62192f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,9 @@
 ## This is part of GNU Astronomy Utilities (gnuastro).
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/NEWS b/NEWS
index 118c3a7..f0c4a7b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,24 @@
 GNU Astronomy Utilities NEWS                          -*- outline -*-
 
 
+* Noteworthy changes in release A.A (library 4.0.0) (YYYY-MM-DD) [stable]
+
+** New features
+
+** Removed features
+
+** Changed features
+
+** Bug fixes
+
+  Many unused result warnings for asprintf in some compilers (bug #52979).
+
+  Configure time CPPFLAGS and LDFLAGS don't pass to BuildProgram (bug #53122).
+
+
+
+
+
 * Noteworthy changes in release 0.5 (library 3.0.0) (2017-12-22) [stable]
 
 ** New features
diff --git a/THANKS b/THANKS
index 1162539..e9a72b9 100644
--- a/THANKS
+++ b/THANKS
@@ -46,6 +46,9 @@ support in Gnuastro. The list is ordered alphabetically (by 
family name).
     Richard Stallman                     rms@gnu.org
     Ole Streicher                        olebole@debian.org
     Alfred M. Szmidt                     ams@gnu.org
+    Michel Tallon                        mtallon@obs.univ-lyon1.fr
+    Juan C. Tello                        jtello@iaa.es
+    Éric Thiébaut                        eric.thiebaut@univ-lyon1.fr
     Ignacio Trujillo                     trujillo@iac.es
     David Valls-Gabaud                   david.valls-gabaud@obspm.fr
     Christopher Willmer                  cnaw@as.arizona.edu
diff --git a/bin/arithmetic/Makefile.am b/bin/arithmetic/Makefile.am
index bd1082d..2e45ef4 100644
--- a/bin/arithmetic/Makefile.am
+++ b/bin/arithmetic/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/arithmetic/args.h b/bin/arithmetic/args.h
index 2bf0e25..8ba927f 100644
--- a/bin/arithmetic/args.h
+++ b/bin/arithmetic/args.h
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/arithmetic/arithmetic.c b/bin/arithmetic/arithmetic.c
index 73375f5..dd560bd 100644
--- a/bin/arithmetic/arithmetic.c
+++ b/bin/arithmetic/arithmetic.c
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/arithmetic/arithmetic.h b/bin/arithmetic/arithmetic.h
index 833c5bf..fc5b65c 100644
--- a/bin/arithmetic/arithmetic.h
+++ b/bin/arithmetic/arithmetic.h
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/arithmetic/authors-cite.h b/bin/arithmetic/authors-cite.h
index 18a278b..b6b7a50 100644
--- a/bin/arithmetic/authors-cite.h
+++ b/bin/arithmetic/authors-cite.h
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/arithmetic/main.c b/bin/arithmetic/main.c
index 96d0f13..fd21c48 100644
--- a/bin/arithmetic/main.c
+++ b/bin/arithmetic/main.c
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/arithmetic/main.h b/bin/arithmetic/main.h
index f55451c..29c2515 100644
--- a/bin/arithmetic/main.h
+++ b/bin/arithmetic/main.h
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/arithmetic/operands.c b/bin/arithmetic/operands.c
index 76fd166..5948bbe 100644
--- a/bin/arithmetic/operands.c
+++ b/bin/arithmetic/operands.c
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/arithmetic/operands.h b/bin/arithmetic/operands.h
index 0854e98..ae487f5 100644
--- a/bin/arithmetic/operands.h
+++ b/bin/arithmetic/operands.h
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/arithmetic/ui.c b/bin/arithmetic/ui.c
index 6edf638..8c57feb 100644
--- a/bin/arithmetic/ui.c
+++ b/bin/arithmetic/ui.c
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/arithmetic/ui.h b/bin/arithmetic/ui.h
index 5fcffce..ed36277 100644
--- a/bin/arithmetic/ui.h
+++ b/bin/arithmetic/ui.h
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/buildprog/Makefile.am b/bin/buildprog/Makefile.am
index 89e480e..1c89124 100644
--- a/bin/buildprog/Makefile.am
+++ b/bin/buildprog/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Your Name <your@email>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) YYYY, Free Software Foundation, Inc.
+## Copyright (C) 2017-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
@@ -35,9 +35,46 @@ bin_PROGRAMS = astbuildprog
 
 astbuildprog_LDADD = -lgnuastro
 
-astbuildprog_SOURCES = main.c ui.c buildprog.c
+astbuildprog_SOURCES = main.c ui.c buildprog.c astbuildprog.conf
+
+EXTRA_DIST = main.h authors-cite.h args.h ui.h buildprog.h astbuildprog.conf.in
+
+
+
+
+
+# Build the final configuration file. The main problem is the possible
+# CPPFLAGS and LDFLAGS that the user might have given at configure time
+# (stored in `IN_CPPFLAGS' and `IN_LDFLAGS' Makefile
+# variables). BuildProgram also needs to know these directories in order to
+# compile its programs. Here, we will be going
+astbuildprog.conf: $(top_srcdir)/bin/buildprog/astbuildprog.conf.in
+       cp $< $@
+       infoadded="no";                                \
+       for i in $(IN_CPPFLAGS); do                    \
+          if test x"$$i" != x; then                    \
+           if test $$infoadded = "no"; then           \
+             echo "" >> $@;                           \
+             echo "# Installation information" >> $@; \
+             infoadded="yes";                         \
+           fi;                                        \
+           v=$$(echo $$i | sed -e 's/-I//');          \
+           echo " includedir $$v" >> $@;              \
+          fi;                                          \
+       done;                                          \
+       for i in $(IN_LDFLAGS); do                     \
+          if test x"$$i" != x; then                    \
+           if test $$infoadded = "no"; then           \
+             echo "" >> $@;                           \
+             echo "# Installation information" >> $@; \
+             infoadded="yes";                         \
+           fi;                                        \
+           v=$$(echo $$i | sed -e 's/-L//');          \
+           echo " linkdir $$v" >> $@;                 \
+         fi;                                          \
+       done
+
 
-EXTRA_DIST = main.h authors-cite.h args.h ui.h buildprog.h
 
 
 
diff --git a/bin/buildprog/args.h b/bin/buildprog/args.h
index 4961c87..1a3387a 100644
--- a/bin/buildprog/args.h
+++ b/bin/buildprog/args.h
@@ -3,9 +3,9 @@ BuildProgram: Compile and run programs using Gnuastro's library
 BuildProgram is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/buildprog/astbuildprog.conf 
b/bin/buildprog/astbuildprog.conf.in
similarity index 100%
rename from bin/buildprog/astbuildprog.conf
rename to bin/buildprog/astbuildprog.conf.in
diff --git a/bin/buildprog/authors-cite.h b/bin/buildprog/authors-cite.h
index 819ff91..af25d0e 100644
--- a/bin/buildprog/authors-cite.h
+++ b/bin/buildprog/authors-cite.h
@@ -3,9 +3,9 @@ BuildProgram: Compile and run programs using Gnuastro's library
 BuildProgram is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/buildprog/buildprog.c b/bin/buildprog/buildprog.c
index d2f9ea2..79beb3f 100644
--- a/bin/buildprog/buildprog.c
+++ b/bin/buildprog/buildprog.c
@@ -3,9 +3,9 @@ BuildProgram: Compile and run programs using Gnuastro's library
 BuildProgram is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -88,30 +88,37 @@ buildprog(struct buildprogparams *p)
     }
 
   /* Compiler options with values: */
-  if(p->warning)   asprintf(&warning,  "-W%s", p->warning);
-  if(p->optimize)  asprintf(&optimize, "-O%s", p->optimize);
+  if(p->warning)
+    if( asprintf(&warning,  "-W%s", p->warning)<0 )
+      error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+  if(p->optimize)
+    if( asprintf(&optimize, "-O%s", p->optimize)<0 )
+      error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
 
   /* Libtool `.la' file: */
   if(p->la) fullla=p->la;
-  else      asprintf(&fullla, "%s/libgnuastro.la", LIBDIR);
+  else
+    if( asprintf(&fullla, "%s/libgnuastro.la", LIBDIR)<0 )
+      error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
 
   /* Put the command to run into a string. */
-  asprintf(&command, "%s %s %s%s --mode=link gcc %s %s %s %s %s %s %s "
-           "-I%s %s -o %s",
-           GAL_CONFIG_GNULIBTOOL_EXEC,
-           p->cp.quiet ? "--quiet" : "",
-           p->tag      ? "--tag="   : "",
-           p->tag      ? p->tag    : "",
-           warning     ? warning   : "",
-           p->debug    ? "-g"      : "",
-           optimize    ? optimize  : "",
-           include     ? include   : "",
-           linkdir     ? linkdir   : "",
-           p->sourceargs->v,
-           linklib     ?linklib    : "",
-           INCLUDEDIR,
-           fullla,
-           p->cp.output);
+  if( asprintf(&command, "%s %s %s%s --mode=link gcc %s %s %s %s %s %s %s "
+               "-I%s %s -o %s",
+               GAL_CONFIG_GNULIBTOOL_EXEC,
+               p->cp.quiet ? "--quiet" : "",
+               p->tag      ? "--tag="   : "",
+               p->tag      ? p->tag    : "",
+               warning     ? warning   : "",
+               p->debug    ? "-g"      : "",
+               optimize    ? optimize  : "",
+               include     ? include   : "",
+               linkdir     ? linkdir   : "",
+               p->sourceargs->v,
+               linklib     ?linklib    : "",
+               INCLUDEDIR,
+               fullla,
+               p->cp.output)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
 
   /* Compile (and link): */
   retval=system(command);
@@ -129,11 +136,15 @@ buildprog(struct buildprogparams *p)
         {
         case '.':
         case '/':
-          asprintf(&command, "%s %s", p->cp.output, arguments?arguments:"");
+          if( asprintf(&command, "%s %s", p->cp.output,
+                       arguments?arguments:"")<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           break;
 
         default:
-          asprintf(&command, "./%s %s", p->cp.output, arguments?arguments:"");
+          if( asprintf(&command, "./%s %s", p->cp.output,
+                       arguments?arguments:"")<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
         }
 
       /* Print the executed command if necessary, then run it. */
diff --git a/bin/buildprog/buildprog.h b/bin/buildprog/buildprog.h
index 46b62e4..bd197a3 100644
--- a/bin/buildprog/buildprog.h
+++ b/bin/buildprog/buildprog.h
@@ -3,9 +3,9 @@ BuildProgram: Compile and run programs using Gnuastro's library
 BuildProgram is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/buildprog/main.c b/bin/buildprog/main.c
index 0dcdedf..bca4682 100644
--- a/bin/buildprog/main.c
+++ b/bin/buildprog/main.c
@@ -3,9 +3,9 @@ BuildProgram: Compile and run programs using Gnuastro's library
 BuildProgram is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/buildprog/main.h b/bin/buildprog/main.h
index 4a1f8ff..654799c 100644
--- a/bin/buildprog/main.h
+++ b/bin/buildprog/main.h
@@ -3,9 +3,9 @@ BuildProgram: Compile and run programs using Gnuastro's library
 BuildProgram is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/buildprog/ui.c b/bin/buildprog/ui.c
index 6a4cc8c..46aef6e 100644
--- a/bin/buildprog/ui.c
+++ b/bin/buildprog/ui.c
@@ -3,9 +3,9 @@ BuildProgram: Compile and run programs using Gnuastro's library
 BuildProgram is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/buildprog/ui.h b/bin/buildprog/ui.h
index bd3b295..85ee1bb 100644
--- a/bin/buildprog/ui.h
+++ b/bin/buildprog/ui.h
@@ -3,9 +3,9 @@ BuildProgram: Compile and run programs using Gnuastro's library
 BuildProgram is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/Makefile.am b/bin/convertt/Makefile.am
index 67312a1..0b851f6 100644
--- a/bin/convertt/Makefile.am
+++ b/bin/convertt/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/convertt/args.h b/bin/convertt/args.h
index 950ceea..dbabc4b 100644
--- a/bin/convertt/args.h
+++ b/bin/convertt/args.h
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/authors-cite.h b/bin/convertt/authors-cite.h
index edae411..e29a12d 100644
--- a/bin/convertt/authors-cite.h
+++ b/bin/convertt/authors-cite.h
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/convertt.c b/bin/convertt/convertt.c
index b51b2bc..72b1d54 100644
--- a/bin/convertt/convertt.c
+++ b/bin/convertt/convertt.c
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/convertt.h b/bin/convertt/convertt.h
index bbb71da..80622d7 100644
--- a/bin/convertt/convertt.h
+++ b/bin/convertt/convertt.h
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/eps.c b/bin/convertt/eps.c
index efa3e33..699f240 100644
--- a/bin/convertt/eps.c
+++ b/bin/convertt/eps.c
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/eps.h b/bin/convertt/eps.h
index 6005f6e..b9eba01 100644
--- a/bin/convertt/eps.h
+++ b/bin/convertt/eps.h
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/jpeg.c b/bin/convertt/jpeg.c
index c4b8cbe..dd8989b 100644
--- a/bin/convertt/jpeg.c
+++ b/bin/convertt/jpeg.c
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -261,7 +261,8 @@ jpeg_read_to_ll(char *filename, gal_data_t **list, size_t 
minmapsize)
     {
       dsize[0]=s0;
       dsize[1]=s1;
-      asprintf(&name, "JPEG_CH_%zu", i+1);
+      if( asprintf(&name, "JPEG_CH_%zu", i+1)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_data_add_alloc(list, allcolors[i], GAL_TYPE_UINT8, ndim,
                               dsize, NULL, 0, minmapsize, name, NULL, NULL);
       free(name);
diff --git a/bin/convertt/jpeg.h b/bin/convertt/jpeg.h
index cfe7a9f..14a9310 100644
--- a/bin/convertt/jpeg.h
+++ b/bin/convertt/jpeg.h
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/main.c b/bin/convertt/main.c
index 2d1f9b8..c59b7c7 100644
--- a/bin/convertt/main.c
+++ b/bin/convertt/main.c
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/main.h b/bin/convertt/main.h
index 51ada58..35b9aa9 100644
--- a/bin/convertt/main.h
+++ b/bin/convertt/main.h
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convertt/ui.c b/bin/convertt/ui.c
index 65d01f6..e6a7aec 100644
--- a/bin/convertt/ui.c
+++ b/bin/convertt/ui.c
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -614,7 +614,8 @@ ui_add_dot_use_automatic_output(struct converttparams *p)
   /* If the suffix does not start with a `.', put one there. */
   if(suffix[0]!='.')
     {
-      asprintf(&tmp, ".%s", suffix);
+      if( asprintf(&tmp, ".%s", suffix)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       free(suffix);
       suffix=tmp;
     }
diff --git a/bin/convertt/ui.h b/bin/convertt/ui.h
index 2afe039..08c1e42 100644
--- a/bin/convertt/ui.h
+++ b/bin/convertt/ui.h
@@ -3,9 +3,9 @@ ConvertType - Convert between various types of files.
 ConvertType is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convolve/Makefile.am b/bin/convolve/Makefile.am
index 846d725..ea3e80e 100644
--- a/bin/convolve/Makefile.am
+++ b/bin/convolve/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/convolve/args.h b/bin/convolve/args.h
index c0445d4..f8a17dd 100644
--- a/bin/convolve/args.h
+++ b/bin/convolve/args.h
@@ -3,9 +3,9 @@ Convolve - Convolve input data with a given kernel.
 Convolve is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convolve/authors-cite.h b/bin/convolve/authors-cite.h
index 9d961d6..b66af0d 100644
--- a/bin/convolve/authors-cite.h
+++ b/bin/convolve/authors-cite.h
@@ -3,9 +3,9 @@ Convolve - Convolve input data with a given kernel.
 Convolve is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convolve/convolve.c b/bin/convolve/convolve.c
index f99fa7f..94354a3 100644
--- a/bin/convolve/convolve.c
+++ b/bin/convolve/convolve.c
@@ -3,9 +3,9 @@ Convolve - Convolve input data with a given kernel.
 Convolve is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convolve/convolve.h b/bin/convolve/convolve.h
index 32e89ef..9bdb431 100644
--- a/bin/convolve/convolve.h
+++ b/bin/convolve/convolve.h
@@ -3,9 +3,9 @@ Convolve - Convolve input data with a given kernel.
 Convolve is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convolve/main.c b/bin/convolve/main.c
index 760746c..f317cc9 100644
--- a/bin/convolve/main.c
+++ b/bin/convolve/main.c
@@ -3,9 +3,9 @@ Convolve - Convolve input data with a given kernel.
 Convolve is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convolve/main.h b/bin/convolve/main.h
index 0e9d924..11c0f53 100644
--- a/bin/convolve/main.h
+++ b/bin/convolve/main.h
@@ -3,9 +3,9 @@ Convolve - Convolve input data with a given kernel.
 Convolve is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convolve/ui.c b/bin/convolve/ui.c
index d2f892e..831a7e6 100644
--- a/bin/convolve/ui.c
+++ b/bin/convolve/ui.c
@@ -3,9 +3,9 @@ Convolve - Convolve input data with a given kernel.
 Convolve is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/convolve/ui.h b/bin/convolve/ui.h
index 9cff5a0..947e1a3 100644
--- a/bin/convolve/ui.h
+++ b/bin/convolve/ui.h
@@ -3,9 +3,9 @@ Convolve - Convolve input data with a given kernel.
 Convolve is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/cosmiccal/Makefile.am b/bin/cosmiccal/Makefile.am
index cbe90fd..29b7487 100644
--- a/bin/cosmiccal/Makefile.am
+++ b/bin/cosmiccal/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2016, Free Software Foundation, Inc.
+## Copyright (C) 2016-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/cosmiccal/args.h b/bin/cosmiccal/args.h
index 8def9bc..6c7d5cd 100644
--- a/bin/cosmiccal/args.h
+++ b/bin/cosmiccal/args.h
@@ -3,9 +3,9 @@ CosmicCalculator - Calculate cosmological parameters
 CosmicCalculator is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/cosmiccal/authors-cite.h b/bin/cosmiccal/authors-cite.h
index 0d27713..879fa94 100644
--- a/bin/cosmiccal/authors-cite.h
+++ b/bin/cosmiccal/authors-cite.h
@@ -3,9 +3,9 @@ CosmicCalculator - Calculate cosmological parameters
 CosmicCalculator is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/cosmiccal/cosmiccal.c b/bin/cosmiccal/cosmiccal.c
index 1350239..1ce4ad2 100644
--- a/bin/cosmiccal/cosmiccal.c
+++ b/bin/cosmiccal/cosmiccal.c
@@ -3,9 +3,9 @@ CosmicCalculator - Calculate cosmological parameters
 CosmicCalculator is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/cosmiccal/cosmiccal.h b/bin/cosmiccal/cosmiccal.h
index 946a3a7..bf257d5 100644
--- a/bin/cosmiccal/cosmiccal.h
+++ b/bin/cosmiccal/cosmiccal.h
@@ -3,9 +3,9 @@ CosmicCalculator - Calculate cosmological parameters
 CosmicCalculator is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/cosmiccal/main.c b/bin/cosmiccal/main.c
index cc38b55..4eb3f03 100644
--- a/bin/cosmiccal/main.c
+++ b/bin/cosmiccal/main.c
@@ -3,9 +3,9 @@ CosmicCalculator - Calculate cosmological parameters
 CosmicCalculator is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/cosmiccal/main.h b/bin/cosmiccal/main.h
index df918c8..7eac1a3 100644
--- a/bin/cosmiccal/main.h
+++ b/bin/cosmiccal/main.h
@@ -3,9 +3,9 @@ CosmicCalculator - Calculate cosmological parameters
 CosmicCalculator is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/cosmiccal/ui.c b/bin/cosmiccal/ui.c
index adf1cf1..f792d5d 100644
--- a/bin/cosmiccal/ui.c
+++ b/bin/cosmiccal/ui.c
@@ -3,9 +3,9 @@ CosmicCalculator - Calculate cosmological parameters
 CosmicCalculator is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/cosmiccal/ui.h b/bin/cosmiccal/ui.h
index 40cc70f..4d449d6 100644
--- a/bin/cosmiccal/ui.h
+++ b/bin/cosmiccal/ui.h
@@ -3,9 +3,9 @@ CosmicCalculator - Calculate cosmological parameters
 CosmicCalculator is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/crop/Makefile.am b/bin/crop/Makefile.am
index b2d1fac..24c7a62 100644
--- a/bin/crop/Makefile.am
+++ b/bin/crop/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/crop/args.h b/bin/crop/args.h
index e2e9c3a..714b8d7 100644
--- a/bin/crop/args.h
+++ b/bin/crop/args.h
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/crop/authors-cite.h b/bin/crop/authors-cite.h
index aa4cc17..b306f0e 100644
--- a/bin/crop/authors-cite.h
+++ b/bin/crop/authors-cite.h
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/crop/crop.c b/bin/crop/crop.c
index 16c2bfc..bccd980 100644
--- a/bin/crop/crop.c
+++ b/bin/crop/crop.c
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -67,12 +67,19 @@ crop_verbose_info(struct onecropparams *crp)
 
   /* Define the output string based on the length of the output file. */
   if ( outnamelen > FILENAME_BUFFER_IN_VERB )
-    asprintf(&msg, "...%s %s: %zu input%s.",
-             &crp->name[ outnamelen - FILENAME_BUFFER_IN_VERB + 3 ],
-             filestatus, crp->numimg, crp->numimg==1 ?  "" :"s");
+    {
+      if( asprintf(&msg, "...%s %s: %zu input%s.",
+                   &crp->name[ outnamelen - FILENAME_BUFFER_IN_VERB + 3 ],
+                   filestatus, crp->numimg, crp->numimg==1 ?  "" :"s")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
   else
-    asprintf(&msg, "%-*s %s: %zu input%s.", FILENAME_BUFFER_IN_VERB,
-             crp->name, filestatus, crp->numimg, crp->numimg==1 ? "" : "s");
+    {
+      if( asprintf(&msg, "%-*s %s: %zu input%s.", FILENAME_BUFFER_IN_VERB,
+                   crp->name, filestatus, crp->numimg,
+                   crp->numimg==1 ? "" : "s")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
 
   /* Print the results. */
   gal_timing_report(NULL, msg, 2);
@@ -120,15 +127,16 @@ crop_verbose_final(struct cropparams *p)
           }
 
       /* Print the basic information. */
-      asprintf(&msg, "%zu crops created.", numcrops);
+      if( asprintf(&msg, "%zu crops created.", numcrops)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(NULL, msg, 1);
       free(msg);
 
       /* Only if the user wanted to check the center. */
       if(p->checkcenter)
         {
-          asprintf(&msg, "%zu filled in the center.",
-                   numcfilled);
+          if( asprintf(&msg, "%zu filled in the center.", numcfilled)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_timing_report(NULL, msg, 1);
           free(msg);
         }
@@ -136,8 +144,9 @@ crop_verbose_final(struct cropparams *p)
       /* Only if there were stitched images. */
       if(numstitched)
         {
-          asprintf(&msg, "%zu crops used more than one input.",
-                  numstitched);
+          if( asprintf(&msg, "%zu crops used more than one input.",
+                       numstitched)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_timing_report(NULL, msg, 1);
           free(msg);
         }
@@ -460,8 +469,9 @@ crop(struct cropparams *p)
     {
       if(p->checkcenter)
         {
-          asprintf(&tmp, "Width of central check box: %zu",
-                   p->checkcenter);
+          if( asprintf(&tmp, "Width of central check box: %zu",
+                       p->checkcenter)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_list_str_add(&comments, tmp, 0);
         }
       gal_checkset_writable_remove(LOGFILENAME, 0, p->cp.dontdelete);
diff --git a/bin/crop/crop.h b/bin/crop/crop.h
index 3fef40c..633e998 100644
--- a/bin/crop/crop.h
+++ b/bin/crop/crop.h
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/crop/main.c b/bin/crop/main.c
index c929774..5d3ee20 100644
--- a/bin/crop/main.c
+++ b/bin/crop/main.c
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/crop/main.h b/bin/crop/main.h
index a61e50e..d389c48 100644
--- a/bin/crop/main.h
+++ b/bin/crop/main.h
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/crop/onecrop.c b/bin/crop/onecrop.c
index c68c405..cabe7b9 100644
--- a/bin/crop/onecrop.c
+++ b/bin/crop/onecrop.c
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -452,12 +452,14 @@ onecrop_name(struct onecropparams *crp)
       if(p->name)
         {
           strarr=p->name;
-          asprintf(&crp->name, "%s%s%s", cp->output, strarr[crp->out_ind],
-                   p->suffix);
+          if( asprintf(&crp->name, "%s%s%s", cp->output, strarr[crp->out_ind],
+                       p->suffix)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
         }
       else
-        asprintf(&crp->name, "%s%zu%s", cp->output, crp->out_ind+1,
-                 p->suffix);
+        if( asprintf(&crp->name, "%s%zu%s", cp->output, crp->out_ind+1,
+                     p->suffix)<0 )
+          error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
 
       /* Make sure the file doesn't exist. */
       gal_checkset_writable_remove(crp->name, 0, cp->dontdelete);
diff --git a/bin/crop/onecrop.h b/bin/crop/onecrop.h
index 55b396e..b68d868 100644
--- a/bin/crop/onecrop.h
+++ b/bin/crop/onecrop.h
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/crop/ui.c b/bin/crop/ui.c
index 0eb083c..f03eed3 100644
--- a/bin/crop/ui.c
+++ b/bin/crop/ui.c
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -726,8 +726,9 @@ ui_make_log(struct cropparams *p)
   if(p->cp.log==0) return;
 
   /* Column to specify if the central pixels are filled. */
-  asprintf(&comment, "Are the central pixels filled? (1: yes, 0: no, "
-           "%u: not checked)", GAL_BLANK_UINT8);
+  if( asprintf(&comment, "Are the central pixels filled? (1: yes, 0: no, "
+               "%u: not checked)", GAL_BLANK_UINT8)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_data_add_alloc(&p->log, NULL, GAL_TYPE_UINT8, 1, &p->numout,
                           NULL, 1, p->cp.minmapsize, "CENTER_FILLED",
                           "bool", comment);
@@ -959,13 +960,15 @@ ui_read_check_inputs_setup(int argc, char *argv[], struct 
cropparams *p)
   if(!p->cp.quiet)
     {
       printf(PROGRAM_NAME" started on %s", ctime(&p->rawtime));
-      asprintf(&msg, "Read metadata of %zu dataset%s.", p->numin,
-              p->numin>1 ? "s" : "");
+      if( asprintf(&msg, "Read metadata of %zu dataset%s.", p->numin,
+                   p->numin>1 ? "s" : "")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 1);
       if(p->numout>1)
         {
-          asprintf(&msg, "Will try making %zu crops (from catalog).",
-                   p->numout);
+          if( asprintf(&msg, "Will try making %zu crops (from catalog).",
+                       p->numout)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_timing_report(NULL, msg, 1);
         }
     }
diff --git a/bin/crop/ui.h b/bin/crop/ui.h
index fd15de0..ff00ae4 100644
--- a/bin/crop/ui.h
+++ b/bin/crop/ui.h
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/crop/wcsmode.c b/bin/crop/wcsmode.c
index f884620..c4aa8f3 100644
--- a/bin/crop/wcsmode.c
+++ b/bin/crop/wcsmode.c
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/crop/wcsmode.h b/bin/crop/wcsmode.h
index ead7fff..7cb6d30 100644
--- a/bin/crop/wcsmode.h
+++ b/bin/crop/wcsmode.h
@@ -3,9 +3,9 @@ Crop - Crop a given size from one or multiple images.
 Crop is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/Makefile.am b/bin/fits/Makefile.am
index c2229af..fa43cad 100644
--- a/bin/fits/Makefile.am
+++ b/bin/fits/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/fits/args.h b/bin/fits/args.h
index 44abbfe..a792d6c 100644
--- a/bin/fits/args.h
+++ b/bin/fits/args.h
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/authors-cite.h b/bin/fits/authors-cite.h
index ec4b666..8095131 100644
--- a/bin/fits/authors-cite.h
+++ b/bin/fits/authors-cite.h
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/extension.c b/bin/fits/extension.c
index 1e5deb0..864b8c6 100644
--- a/bin/fits/extension.c
+++ b/bin/fits/extension.c
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/extension.h b/bin/fits/extension.h
index 7aace69..2b7115e 100644
--- a/bin/fits/extension.h
+++ b/bin/fits/extension.h
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/fits.c b/bin/fits/fits.c
index d3ca08e..b836dd4 100644
--- a/bin/fits/fits.c
+++ b/bin/fits/fits.c
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -213,7 +213,8 @@ fits_print_extension_info(struct fitsparams *p)
       /* Move to the next extension if we aren't on the last extension. */
       if( i!=numext-1 && fits_movrel_hdu(fptr, 1, &hdutype, &status) )
         {
-          asprintf(&msg, "moving to hdu %zu", i+1);
+          if( asprintf(&msg, "moving to hdu %zu", i+1)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_fits_io_error(status, msg);
         }
     }
diff --git a/bin/fits/fits.h b/bin/fits/fits.h
index 0564af1..d54378e 100644
--- a/bin/fits/fits.h
+++ b/bin/fits/fits.h
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/keywords.c b/bin/fits/keywords.c
index d41d049..cc0a80a 100644
--- a/bin/fits/keywords.c
+++ b/bin/fits/keywords.c
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/keywords.h b/bin/fits/keywords.h
index 2850929..a9ea31f 100644
--- a/bin/fits/keywords.h
+++ b/bin/fits/keywords.h
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/main.c b/bin/fits/main.c
index d19b6da..b4b9260 100644
--- a/bin/fits/main.c
+++ b/bin/fits/main.c
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/main.h b/bin/fits/main.h
index 782850d..3117d72 100644
--- a/bin/fits/main.h
+++ b/bin/fits/main.h
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/ui.c b/bin/fits/ui.c
index 6713c10..787b9e4 100644
--- a/bin/fits/ui.c
+++ b/bin/fits/ui.c
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/fits/ui.h b/bin/fits/ui.h
index 390f171..e2668c8 100644
--- a/bin/fits/ui.h
+++ b/bin/fits/ui.h
@@ -3,9 +3,9 @@ Fits - View and manipulate FITS extensions and/or headers.
 Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/match/Makefile.am b/bin/match/Makefile.am
index 59595bc..8fb0e3c 100644
--- a/bin/match/Makefile.am
+++ b/bin/match/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2017, Free Software Foundation, Inc.
+## Copyright (C) 2017-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/match/args.h b/bin/match/args.h
index 71f426b..a756527 100644
--- a/bin/match/args.h
+++ b/bin/match/args.h
@@ -3,9 +3,9 @@ Match - A program to match catalogs and WCS warps
 Match is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/match/authors-cite.h b/bin/match/authors-cite.h
index 8a5efbd..5454a76 100644
--- a/bin/match/authors-cite.h
+++ b/bin/match/authors-cite.h
@@ -3,9 +3,9 @@ Match - A program to match catalogs and WCS warps
 Match is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/match/main.c b/bin/match/main.c
index 8186ecd..810b0b1 100644
--- a/bin/match/main.c
+++ b/bin/match/main.c
@@ -3,9 +3,9 @@ Match - A program to match catalogs and WCS warps
 Match is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/match/main.h b/bin/match/main.h
index 3bd8a34..87664a1 100644
--- a/bin/match/main.h
+++ b/bin/match/main.h
@@ -3,9 +3,9 @@ Match - A program to match catalogs and WCS warps
 Match is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/match/match.c b/bin/match/match.c
index c963479..3841afd 100644
--- a/bin/match/match.c
+++ b/bin/match/match.c
@@ -3,9 +3,9 @@ Match - A program to match catalogs and WCS warps
 Match is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/match/match.h b/bin/match/match.h
index 6911dc4..b6524af 100644
--- a/bin/match/match.h
+++ b/bin/match/match.h
@@ -3,9 +3,9 @@ Match - A program to match catalogs and WCS warps
 Match is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/match/ui.c b/bin/match/ui.c
index edc8fd9..8cb6942 100644
--- a/bin/match/ui.c
+++ b/bin/match/ui.c
@@ -3,9 +3,9 @@ Match - A program to match catalogs and WCS warps
 Match is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/match/ui.h b/bin/match/ui.h
index e56730a..d56a9f0 100644
--- a/bin/match/ui.h
+++ b/bin/match/ui.h
@@ -3,9 +3,9 @@ Match - A program to match catalogs and WCS warps
 Match is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/Makefile.am b/bin/mkcatalog/Makefile.am
index 7e590bf..a929552 100644
--- a/bin/mkcatalog/Makefile.am
+++ b/bin/mkcatalog/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/mkcatalog/args.h b/bin/mkcatalog/args.h
index b138516..288aa51 100644
--- a/bin/mkcatalog/args.h
+++ b/bin/mkcatalog/args.h
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/authors-cite.h b/bin/mkcatalog/authors-cite.h
index a6e994c..00d2b88 100644
--- a/bin/mkcatalog/authors-cite.h
+++ b/bin/mkcatalog/authors-cite.h
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/columns.c b/bin/mkcatalog/columns.c
index bb2d9a1..b8061cb 100644
--- a/bin/mkcatalog/columns.c
+++ b/bin/mkcatalog/columns.c
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/columns.h b/bin/mkcatalog/columns.h
index aa6210e..edda273 100644
--- a/bin/mkcatalog/columns.h
+++ b/bin/mkcatalog/columns.h
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/main.c b/bin/mkcatalog/main.c
index 2ebc799..1f92630 100644
--- a/bin/mkcatalog/main.c
+++ b/bin/mkcatalog/main.c
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/main.h b/bin/mkcatalog/main.h
index 9f5804b..6ae8b49 100644
--- a/bin/mkcatalog/main.h
+++ b/bin/mkcatalog/main.h
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/mkcatalog.c b/bin/mkcatalog/mkcatalog.c
index c13c6a7..8e5e02c 100644
--- a/bin/mkcatalog/mkcatalog.c
+++ b/bin/mkcatalog/mkcatalog.c
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -678,59 +678,70 @@ mkcatalog_outputs_same_start(struct mkcatalogparams *p, 
int o0c1,
   char *clumpsfile=p->clumpsfile ? p->clumpsfile : p->inputname;
   char *objectsfile=p->objectsfile ? p->objectsfile : p->inputname;
 
-  asprintf(&str, "%s catalog of %s", o0c1 ? "Object" : "Clump",
-           PROGRAM_STRING);
+  if( asprintf(&str, "%s catalog of %s", o0c1 ? "Object" : "Clump",
+               PROGRAM_STRING)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_str_add(&comments, str, 0);
 
   /* If in a Git controlled directory and output isn't a FITS file (in
      FITS, this will be automatically included). */
   if(p->cp.tableformat==GAL_TABLE_FORMAT_TXT && gal_git_describe())
     {
-      asprintf(&str, "Working directory commit %s", gal_git_describe());
+      if(asprintf(&str, "Working directory commit %s", gal_git_describe())<0)
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
   /* Write the date. However, `ctime' is going to put a new-line character
      in the end of its string, so we are going to remove it manually. */
-  asprintf(&str, "%s started on %s", PROGRAM_NAME, ctime(&p->rawtime));
+  if( asprintf(&str, "%s started on %s", PROGRAM_NAME, ctime(&p->rawtime))<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   str[strlen(str)-1]='\0';
   gal_list_str_add(&comments, str, 0);
 
 
   if(p->cp.tableformat==GAL_TABLE_FORMAT_TXT)
     {
-      asprintf(&str, "--------- Input files ---------");
+      if( asprintf(&str, "--------- Input files ---------")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
-  asprintf(&str, "Values:  %s (hdu: %s).", p->inputname, p->cp.hdu);
+  if( asprintf(&str, "Values:  %s (hdu: %s).", p->inputname, p->cp.hdu)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_str_add(&comments, str, 0);
 
-  asprintf(&str, "Objects: %s (hdu: %s).", objectsfile, p->objectshdu);
+  if( asprintf(&str, "Objects: %s (hdu: %s).", objectsfile, p->objectshdu)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_str_add(&comments, str, 0);
 
   if(p->clumps)
     {
-      asprintf(&str, "Clumps:  %s (hdu: %s).", clumpsfile, p->clumpshdu);
+      if(asprintf(&str, "Clumps:  %s (hdu: %s).", clumpsfile, p->clumpshdu)<0)
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
-  asprintf(&str, "Sky:     %s (hdu: %s).", skyfile, p->skyhdu);
+  if( asprintf(&str, "Sky:     %s (hdu: %s).", skyfile, p->skyhdu)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_str_add(&comments, str, 0);
 
-  asprintf(&str, "Sky STD: %s (hdu: %s).", stdfile, p->stdhdu);
+  if( asprintf(&str, "Sky STD: %s (hdu: %s).", stdfile, p->stdhdu)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_str_add(&comments, str, 0);
 
   if(p->upmaskfile)
     {
-      asprintf(&str, "Upperlimit mask: %s (hdu: %s).", p->upmaskfile,
-               p->upmaskhdu);
+      if( asprintf(&str, "Upperlimit mask: %s (hdu: %s).", p->upmaskfile,
+                   p->upmaskhdu)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
   if(p->cp.tableformat==GAL_TABLE_FORMAT_TXT)
     {
-      asprintf(&str, "--------- Supplimentary information ---------");
+      if( asprintf(&str, "--------- Supplimentary information ---------")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
@@ -739,14 +750,16 @@ mkcatalog_outputs_same_start(struct mkcatalogparams *p, 
int o0c1,
       pixarea=gal_wcs_pixel_area_arcsec2(p->input->wcs);
       if( isnan(pixarea)==0 )
         {
-          asprintf(&str, "Pixel area (arcsec^2): %g", pixarea);
+          if( asprintf(&str, "Pixel area (arcsec^2): %g", pixarea)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_list_str_add(&comments, str, 0);
         }
     }
 
   if(p->hasmag)
     {
-      asprintf(&str, "Zeropoint magnitude: %.4f", p->zeropoint);
+      if( asprintf(&str, "Zeropoint magnitude: %.4f", p->zeropoint)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
@@ -754,15 +767,16 @@ mkcatalog_outputs_same_start(struct mkcatalogparams *p, 
int o0c1,
   if( !isnan(p->zeropoint) &&  !isnan(p->sfmagnsigma) )
     {
       /* Per pixel. */
-      asprintf(&str, "%g sigma surface brightness (magnitude/pixel): %.3f",
-               p->sfmagnsigma, ( -2.5f
-                                 *log10( p->sfmagnsigma
-                                         * p->medstd )
-                                 + p->zeropoint ) );
+      if( asprintf(&str, "%g sigma surface brightness (magnitude/pixel): "
+                   "%.3f", p->sfmagnsigma, ( -2.5f
+                                             *log10( p->sfmagnsigma
+                                                     * p->medstd )
+                                             + p->zeropoint ) )<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
 
-      /* Per requested projected area: if a pixel area could be measured (a
-         WCS was given), then also estimate the surface brightness over one
+      /* Requested projected area: if a pixel area could be measured (a WCS
+         was given), then also estimate the surface brightness over one
          arcsecond^2. From the pixel area, we know how many pixels are
          necessary to fill the requested projected area (in
          arcsecond^2). We also know that as the number of samples (pixels)
@@ -771,14 +785,19 @@ mkcatalog_outputs_same_start(struct mkcatalogparams *p, 
int o0c1,
       if(!isnan(pixarea) && !isnan(p->sfmagarea))
         {
           /* Prepare the comment/information. */
-          if(p->sfmagarea==1.0f) tstr=NULL;
-          else                   asprintf(&tstr, "%g-", p->sfmagarea);
-          asprintf(&str, "%g sigma surface brightness (magnitude/%sarcsec^2): "
-                   "%.3f", p->sfmagnsigma, tstr ? tstr : "",
-                   ( -2.5f * log10( p->sfmagnsigma
-                                    * p->medstd
-                                    * sqrt( p->sfmagarea / pixarea) )
-                     + p->zeropoint ) );
+          if(p->sfmagarea==1.0f)
+            tstr=NULL;
+          else
+            if( asprintf(&tstr, "%g-", p->sfmagarea)<0 )
+              error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+          if( asprintf(&str, "%g sigma surface brightness "
+                       "(magnitude/%sarcsec^2): %.3f", p->sfmagnsigma,
+                       tstr ? tstr : "",
+                       ( -2.5f * log10( p->sfmagnsigma
+                                        * p->medstd
+                                        * sqrt( p->sfmagarea / pixarea) )
+                         + p->zeropoint ) )<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
 
           /* Add the final string/line to the catalog comments. */
           gal_list_str_add(&comments, str, 0);
@@ -792,36 +811,42 @@ mkcatalog_outputs_same_start(struct mkcatalogparams *p, 
int o0c1,
         }
 
       /* Notice: */
-      asprintf(&str, "Pixel STD for surface brightness calculation%s: %f",
-               (!isnan(pixarea) && !isnan(p->sfmagarea))?"s":"", p->medstd);
+      if( asprintf(&str, "Pixel STD for surface brightness calculation%s: %f",
+                   (!isnan(pixarea) && !isnan(p->sfmagarea))?"s":"",
+                   p->medstd)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
   snlim = o0c1 ? p->clumpsn : p->detsn;
   if( !isnan(snlim) )
     {
-      asprintf(&str, "%s limiting signal-to-noise ratio: %.3f", ObjClump,
-               snlim);
+      if( asprintf(&str, "%s limiting signal-to-noise ratio: %.3f", ObjClump,
+                   snlim)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
   if(o0c1==0)
     {
-      asprintf(&str, "(NOTE: S/N limit above is for pseudo-detections, "
-               "not objects.)");
+      if( asprintf(&str, "(NOTE: S/N limit above is for pseudo-detections, "
+                   "not objects.)")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
   if(p->cpscorr>1.0f)
     {
-      asprintf(&str, "Counts-per-second correction: %.3f", p->cpscorr);
+      if( asprintf(&str, "Counts-per-second correction: %.3f", p->cpscorr)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
   if( !isnan(p->threshold) )
     {
-      asprintf(&str, "**IMPORTANT** Pixel threshold (multiple of local "
-               "std): %.3f", p->threshold);
+      if( asprintf(&str, "**IMPORTANT** Pixel threshold (multiple of local "
+                   "std): %.3f", p->threshold)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
@@ -830,11 +855,13 @@ mkcatalog_outputs_same_start(struct mkcatalogparams *p, 
int o0c1,
     {
       if(p->cp.tableformat==GAL_TABLE_FORMAT_TXT)
         {
-          asprintf(&str, "--------- Upper-limit measurement ---------");
+          if(asprintf(&str, "--------- Upper-limit measurement ---------")<0)
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_list_str_add(&comments, str, 0);
         }
 
-      asprintf(&str, "Number of random samples: %zu", p->upnum);
+      if( asprintf(&str, "Number of random samples: %zu", p->upnum)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
 
       if(p->uprange)
@@ -842,13 +869,15 @@ mkcatalog_outputs_same_start(struct mkcatalogparams *p, 
int o0c1,
           switch(p->input->ndim)
             {
             case 2:
-              asprintf(&str, "Range of random samples about target: %zu, %zu",
-                       p->uprange[1], p->uprange[0]);
+              if( asprintf(&str, "Range of random samples about target: "
+                           "%zu, %zu", p->uprange[1], p->uprange[0])<0 )
+                error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
               break;
             case 3:
-              asprintf(&str, "Range of random samples about target: %zu, "
-                       "%zu, %zu", p->uprange[2], p->uprange[1],
-                       p->uprange[0]);
+              if( asprintf(&str, "Range of random samples about target: %zu, "
+                           "%zu, %zu", p->uprange[2], p->uprange[1],
+                           p->uprange[0])<0 )
+                error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
               break;
             default:
               error(EXIT_FAILURE, 0, "%s: a bug! Please contact us at %s to "
@@ -859,26 +888,36 @@ mkcatalog_outputs_same_start(struct mkcatalogparams *p, 
int o0c1,
           gal_list_str_add(&comments, str, 0);
         }
 
-      asprintf(&str, "Random number generator name: %s", p->rngname);
+      if( asprintf(&str, "Random number generator name: %s", p->rngname)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
 
-      asprintf(&str, "Random number generator seed: %"PRIu64, p->seed);
+      if( asprintf(&str, "Random number generator seed: %"PRIu64, p->seed)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
 
-      asprintf(&str, "Multiple of STD used for sigma-clipping: %.3f",
-               p->upsigmaclip[0]);
+      if( asprintf(&str, "Multiple of STD used for sigma-clipping: %.3f",
+                   p->upsigmaclip[0])<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
 
       if(p->upsigmaclip[1]>=1.0f)
-        asprintf(&str, "Number of clips for sigma-clipping: %.0f",
-                 p->upsigmaclip[1]);
+        {
+          if( asprintf(&str, "Number of clips for sigma-clipping: %.0f",
+                       p->upsigmaclip[1])<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       else
-        asprintf(&str, "Tolerance level to sigma-clipping: %.3f",
-                 p->upsigmaclip[1]);
+        {
+          if( asprintf(&str, "Tolerance level to sigma-clipping: %.3f",
+                       p->upsigmaclip[1])<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       gal_list_str_add(&comments, str, 0);
 
-      asprintf(&str, "Multiple of sigma-clipped STD for upper-limit: %.3f",
-               p->upnsigma);
+      if( asprintf(&str, "Multiple of sigma-clipped STD for upper-limit: "
+                   "%.3f", p->upnsigma)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
@@ -886,7 +925,8 @@ mkcatalog_outputs_same_start(struct mkcatalogparams *p, int 
o0c1,
 
   if(p->cp.tableformat==GAL_TABLE_FORMAT_TXT)
     {
-      asprintf(&str, "--------- Table columns ---------");
+      if( asprintf(&str, "--------- Table columns ---------")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, str, 0);
     }
 
diff --git a/bin/mkcatalog/mkcatalog.h b/bin/mkcatalog/mkcatalog.h
index bdae1cb..959b309 100644
--- a/bin/mkcatalog/mkcatalog.h
+++ b/bin/mkcatalog/mkcatalog.h
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/ui.c b/bin/mkcatalog/ui.c
index 3ad935b..2543a0e 100644
--- a/bin/mkcatalog/ui.c
+++ b/bin/mkcatalog/ui.c
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -495,15 +495,21 @@ ui_preparations_read_inputs(struct mkcatalogparams *p)
                          || p->clumps->type==GAL_TYPE_FLOAT64 ) ) )
     {
       if(p->clumps)
-        asprintf(&namestypes, "However, `%s' (hdu: %s) and `%s' (hdu: %s) "
-                 "have types of `%s' and `%s' respectively", objectsfile,
-                 p->objectshdu, clumpsfile, p->clumpshdu,
-                 gal_type_name(p->objects->type, 1),
-                 gal_type_name(p->clumps->type, 1) );
+        {
+          if( asprintf(&namestypes, "However, `%s' (hdu: %s) and `%s' "
+                       "(hdu: %s) have types of `%s' and `%s' respectively",
+                       objectsfile, p->objectshdu, clumpsfile, p->clumpshdu,
+                       gal_type_name(p->objects->type, 1),
+                       gal_type_name(p->clumps->type, 1) )<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       else
-        asprintf(&namestypes, "However, %s (hdu: %s) has a type of %s",
-                 objectsfile, p->objectshdu,
-                 gal_type_name(p->objects->type, 1));
+        {
+          if( asprintf(&namestypes, "However, %s (hdu: %s) has a type of %s",
+                       objectsfile, p->objectshdu,
+                       gal_type_name(p->objects->type, 1))<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       error(EXIT_FAILURE, 0, "labeled images (for objects or clumps) must "
             "have an integer datatype. %s.\n\n"
             "If you are sure the images contain only integer values but "
@@ -607,8 +613,10 @@ ui_preparations_read_keywords(struct mkcatalogparams *p)
       if(keys[0].status) p->clumpsn=NAN;
       if(keys[1].status)
         {
-          asprintf(&msg, "couldn't find/read NUMLABS in the header of "
-                   "%s (hdu: %s), see error above", clumpsfile, p->clumpshdu);
+          if( asprintf(&msg, "couldn't find/read NUMLABS in the header of "
+                       "%s (hdu: %s), see error above", clumpsfile,
+                       p->clumpshdu)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_fits_io_error(keys[1].status, msg);
         }
     }
diff --git a/bin/mkcatalog/ui.h b/bin/mkcatalog/ui.h
index fe5d2b3..e5a32a5 100644
--- a/bin/mkcatalog/ui.h
+++ b/bin/mkcatalog/ui.h
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/upperlimit.c b/bin/mkcatalog/upperlimit.c
index 12be8d5..58424ec 100644
--- a/bin/mkcatalog/upperlimit.c
+++ b/bin/mkcatalog/upperlimit.c
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkcatalog/upperlimit.h b/bin/mkcatalog/upperlimit.h
index 7ce57bf..143252f 100644
--- a/bin/mkcatalog/upperlimit.h
+++ b/bin/mkcatalog/upperlimit.h
@@ -3,9 +3,9 @@ MakeCatalog - Make a catalog from an input and labeled image.
 MakeCatalog is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mknoise/Makefile.am b/bin/mknoise/Makefile.am
index da95ebc..e70573c 100644
--- a/bin/mknoise/Makefile.am
+++ b/bin/mknoise/Makefile.am
@@ -3,7 +3,7 @@
 ## Original author:
 ##     Mohammad Akhlaghi <akhlaghi@gnu.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/mknoise/args.h b/bin/mknoise/args.h
index 797952e..a841d8f 100644
--- a/bin/mknoise/args.h
+++ b/bin/mknoise/args.h
@@ -3,9 +3,9 @@ MakeNoise - Add noise to a dataset.
 MakeNoise is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mknoise/authors-cite.h b/bin/mknoise/authors-cite.h
index 7bf93f7..f961888 100644
--- a/bin/mknoise/authors-cite.h
+++ b/bin/mknoise/authors-cite.h
@@ -3,9 +3,9 @@ MakeNoise - Add noise to a dataset.
 MakeNoise is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mknoise/main.c b/bin/mknoise/main.c
index 73cda3e..5beb793 100644
--- a/bin/mknoise/main.c
+++ b/bin/mknoise/main.c
@@ -3,9 +3,9 @@ MakeNoise - Add noise to a dataset.
 MakeNoise is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mknoise/main.h b/bin/mknoise/main.h
index fd4c386..25ab114 100644
--- a/bin/mknoise/main.h
+++ b/bin/mknoise/main.h
@@ -3,9 +3,9 @@ MakeNoise - Add noise to a dataset.
 MakeNoise is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mknoise/mknoise.c b/bin/mknoise/mknoise.c
index 82505ae..95f0a0b 100644
--- a/bin/mknoise/mknoise.c
+++ b/bin/mknoise/mknoise.c
@@ -3,9 +3,9 @@ MakeNoise - Add noise to a dataset.
 MakeNoise is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mknoise/mknoise.h b/bin/mknoise/mknoise.h
index 2c8998a..b424652 100644
--- a/bin/mknoise/mknoise.h
+++ b/bin/mknoise/mknoise.h
@@ -3,9 +3,9 @@ MakeNoise - Add noise to a dataset.
 MakeNoise is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mknoise/ui.c b/bin/mknoise/ui.c
index 98adb7e..eba6e4f 100644
--- a/bin/mknoise/ui.c
+++ b/bin/mknoise/ui.c
@@ -3,9 +3,9 @@ MakeNoise - Add noise to a dataset.
 MakeNoise is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mknoise/ui.h b/bin/mknoise/ui.h
index eed9b92..ad72af2 100644
--- a/bin/mknoise/ui.h
+++ b/bin/mknoise/ui.h
@@ -3,9 +3,9 @@ MakeNoise - Add noise to a dataset.
 MakeNoise is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/Makefile.am b/bin/mkprof/Makefile.am
index 6806258..31b3fa8 100644
--- a/bin/mkprof/Makefile.am
+++ b/bin/mkprof/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/mkprof/args.h b/bin/mkprof/args.h
index c13308f..99bddd2 100644
--- a/bin/mkprof/args.h
+++ b/bin/mkprof/args.h
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/authors-cite.h b/bin/mkprof/authors-cite.h
index d48db6b..31504b3 100644
--- a/bin/mkprof/authors-cite.h
+++ b/bin/mkprof/authors-cite.h
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/main.c b/bin/mkprof/main.c
index 9927864..800093c 100644
--- a/bin/mkprof/main.c
+++ b/bin/mkprof/main.c
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/main.h b/bin/mkprof/main.h
index 17ae8b0..b31e229 100644
--- a/bin/mkprof/main.h
+++ b/bin/mkprof/main.h
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/mkprof.c b/bin/mkprof/mkprof.c
index f86932e..740e12d 100644
--- a/bin/mkprof/mkprof.c
+++ b/bin/mkprof/mkprof.c
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -138,7 +138,8 @@ saveindividual(struct mkonthread *mkp)
     filename=p->mergedimgname;
   else
     {
-      asprintf(&filename, "%s%zu_%s", outdir, ibq->id, p->basename);
+      if( asprintf(&filename, "%s%zu_%s", outdir, ibq->id, p->basename)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_checkset_writable_remove(filename, 0, p->cp.dontdelete);
     }
 
@@ -166,7 +167,8 @@ saveindividual(struct mkonthread *mkp)
   /* Report if in verbose mode. */
   if(!p->cp.quiet)
     {
-      asprintf(&jobname, "%s created.", filename);
+      if( asprintf(&jobname, "%s created.", filename)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(NULL, jobname, 2);
       free(jobname);
     }
@@ -557,8 +559,9 @@ mkprof_write(struct mkprofparams *p)
       ++complete;
       if(!p->cp.quiet && p->num>1)
         {
-          asprintf(&jobname, "row %zu complete, %zu left to go",
-                   ibq->id+1, num-complete);
+          if( asprintf(&jobname, "row %zu complete, %zu left to go",
+                       ibq->id+1, num-complete)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_timing_report(NULL, jobname, 2);
           free(jobname);
         }
@@ -597,7 +600,8 @@ mkprof_write(struct mkprofparams *p)
       /* In verbose mode, print the information. */
       if(!p->cp.quiet)
         {
-          asprintf(&jobname, "%s created.", p->mergedimgname);
+          if( asprintf(&jobname, "%s created.", p->mergedimgname)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           gal_timing_report(&t1, jobname, 1);
           free(jobname);
         }
@@ -721,7 +725,8 @@ mkprof(struct mkprofparams *p)
   /* Write the log file. */
   if(p->cp.log)
     {
-      asprintf(&tmp, "Zeropoint: %g", p->zeropoint);
+      if( asprintf(&tmp, "Zeropoint: %g", p->zeropoint)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_list_str_add(&comments, tmp, 0);
       gal_checkset_writable_remove(LOGFILENAME, 0, p->cp.dontdelete);
       gal_table_write_log(p->log, PROGRAM_STRING, &p->rawtime, comments,
diff --git a/bin/mkprof/mkprof.h b/bin/mkprof/mkprof.h
index 03151b2..4eef34e 100644
--- a/bin/mkprof/mkprof.h
+++ b/bin/mkprof/mkprof.h
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/oneprofile.c b/bin/mkprof/oneprofile.c
index 7ee571e..3b1fc28 100644
--- a/bin/mkprof/oneprofile.c
+++ b/bin/mkprof/oneprofile.c
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/oneprofile.h b/bin/mkprof/oneprofile.h
index 08cc19c..e9c1d4f 100644
--- a/bin/mkprof/oneprofile.h
+++ b/bin/mkprof/oneprofile.h
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/profiles.c b/bin/mkprof/profiles.c
index 39e38f4..13369a0 100644
--- a/bin/mkprof/profiles.c
+++ b/bin/mkprof/profiles.c
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/profiles.h b/bin/mkprof/profiles.h
index 0efa236..888acff 100644
--- a/bin/mkprof/profiles.h
+++ b/bin/mkprof/profiles.h
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/mkprof/ui.c b/bin/mkprof/ui.c
index 07da299..2f54739 100644
--- a/bin/mkprof/ui.c
+++ b/bin/mkprof/ui.c
@@ -3,9 +3,9 @@ Arithmetic - Do arithmetic operations on images.
 Arithmetic is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -1624,7 +1624,8 @@ ui_make_log(struct mkprofparams *p)
 
   /* Row number in input catalog. */
   name=gal_fits_name_save_as_string(p->catname, p->cp.hdu);
-  asprintf(&comment, "Row number of profile in %s.", name);
+  if( asprintf(&comment, "Row number of profile in %s.", name)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_data_add_alloc(&p->log, NULL, GAL_TYPE_UINT64, 1, &p->num, NULL,
                           1, p->cp.minmapsize, "INPUT_ROW_NO", "count",
                           comment);
@@ -1703,40 +1704,56 @@ ui_print_intro(struct mkprofparams *p)
   printf(PROGRAM_NAME" started on %s", ctime(&p->rawtime));
 
   if(p->kernel)
-    asprintf(&jobname, "Building one %s kernel",
-             ui_profile_name_write(p->kernel->status));
+    {
+      if( asprintf(&jobname, "Building one %s kernel",
+                   ui_profile_name_write(p->kernel->status))<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
   else
-    asprintf(&jobname, "%zu profile%sread from %s", p->num,
-             p->num>1?"s ":" ", p->catname);
+    {
+      if( asprintf(&jobname, "%zu profile%sread from %s", p->num,
+                   p->num>1?"s ":" ", p->catname)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
   gal_timing_report(NULL, jobname, 1);
   free(jobname);
 
   if(p->backname)
     {
       if(p->nomerged)
-        asprintf(&jobname, "WCS information read from %s", p->backname);
+        {
+          if( asprintf(&jobname, "WCS information read from %s",
+                       p->backname)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       else
-        asprintf(&jobname, "%s is read and will be used as canvas",
-                 p->backname);
+        {
+          if( asprintf(&jobname, "%s is read and will be used as canvas",
+                       p->backname)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       gal_timing_report(NULL, jobname, 1);
       free(jobname);
     }
 
-  asprintf(&jobname, "Random number generator (RNG) type: %s",
-           gsl_rng_name(p->rng));
+  if( asprintf(&jobname, "Random number generator (RNG) type: %s",
+               gsl_rng_name(p->rng))<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_timing_report(NULL, jobname, 1);
   free(jobname);
   if(p->envseed)
     {
-      asprintf(&jobname, "RNG seed for all profiles: %lu",
-               gsl_rng_default_seed);
+      if( asprintf(&jobname, "RNG seed for all profiles: %lu",
+                   gsl_rng_default_seed)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(NULL, jobname, 1);
       free(jobname);
     }
 
   if(p->kernel==NULL)
     {
-      asprintf(&jobname, "Using %zu threads.", p->cp.numthreads);
+      if( asprintf(&jobname, "Using %zu threads.", p->cp.numthreads)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(NULL, jobname, 1);
       free(jobname);
     }
diff --git a/bin/mkprof/ui.h b/bin/mkprof/ui.h
index dbb116b..22ed6f1 100644
--- a/bin/mkprof/ui.h
+++ b/bin/mkprof/ui.h
@@ -3,9 +3,9 @@ MakeProfiles - Create mock astronomical profiles.
 MakeProfiles is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/Makefile.am b/bin/noisechisel/Makefile.am
index 5a9c83b..70765ea 100644
--- a/bin/noisechisel/Makefile.am
+++ b/bin/noisechisel/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2016, Free Software Foundation, Inc.
+## Copyright (C) 2016-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/noisechisel/args.h b/bin/noisechisel/args.h
index 51a3d76..77cea84 100644
--- a/bin/noisechisel/args.h
+++ b/bin/noisechisel/args.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/authors-cite.h b/bin/noisechisel/authors-cite.h
index f588515..782d42d 100644
--- a/bin/noisechisel/authors-cite.h
+++ b/bin/noisechisel/authors-cite.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/clumps.c b/bin/noisechisel/clumps.c
index e6ca9cb..66de8cc 100644
--- a/bin/noisechisel/clumps.c
+++ b/bin/noisechisel/clumps.c
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -1397,8 +1397,9 @@ clumps_true_find_sn_thresh(struct noisechiselparams *p)
   p->clumpsnthresh = *((float *)(quant->array));
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "Clump S/N: %.2f (%.3f quant of %zu).",
-               p->clumpsnthresh, p->segquant, sn->size);
+      if( asprintf(&msg, "Clump S/N: %.2f (%.3f quant of %zu).",
+                   p->clumpsnthresh, p->segquant, sn->size)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 2);
       free(msg);
     }
diff --git a/bin/noisechisel/clumps.h b/bin/noisechisel/clumps.h
index 0c300fa..531f6c3 100644
--- a/bin/noisechisel/clumps.h
+++ b/bin/noisechisel/clumps.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/detection.c b/bin/noisechisel/detection.c
index 3d000dd..2b24e2d 100644
--- a/bin/noisechisel/detection.c
+++ b/bin/noisechisel/detection.c
@@ -5,7 +5,7 @@ NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) 
package.
 Original author:
      Mohammad Akhlaghi <akhlaghi@gnu.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -110,8 +110,9 @@ detection_initial(struct noisechiselparams *p)
                                                  p->erodengb), 1);
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "Eroded %zu time%s (%zu-connectivity).", p->erode,
-               p->erode>1?"s":"", p->erodengb);
+      if( asprintf(&msg, "Eroded %zu time%s (%zu-connectivity).", p->erode,
+                   p->erode>1?"s":"", p->erodengb)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 2);
       free(msg);
     }
@@ -135,8 +136,9 @@ detection_initial(struct noisechiselparams *p)
                                                 p->openingngb), 1);
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "Opened (depth: %zu, %s connectivity).",
-              p->opening, p->openingngb==4 ? "4" : "8");
+      if( asprintf(&msg, "Opened (depth: %zu, %s connectivity).",
+                   p->opening, p->openingngb==4 ? "4" : "8")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 2);
       free(msg);
     }
@@ -156,7 +158,9 @@ detection_initial(struct noisechiselparams *p)
   /* Report the ending of initial detection. */
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "%zu initial detections found.", p->numinitialdets);
+      if( asprintf(&msg, "%zu initial detections found.",
+                   p->numinitialdets)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t0, msg, 1);
       free(msg);
     }
@@ -439,9 +443,10 @@ detection_sn_write_to_file(struct noisechiselparams *p, 
gal_data_t *sn,
   gal_list_str_t *comments=NULL;
 
   /* Comment for extension on further explanation. */
-  asprintf(&str, "See also: `%s' HDU of output with "
-           "`--checkdetection'", ( s0d1D2<2
-                                   ? "PSEUDOS-FOR-SN": "DILATED" ));
+  if( asprintf(&str, "See also: `%s' HDU of output with "
+               "`--checkdetection'", ( s0d1D2<2
+                                       ? "PSEUDOS-FOR-SN": "DILATED" ))<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_str_add(&comments, str, 0);
 
 
@@ -767,8 +772,9 @@ detection_pseudo_real(struct noisechiselparams *p)
   p->detsnthresh = *((float *)(quant->array));
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "Pseudo-det S/N: %.2f (%.2f quant of %zu).",
-               p->detsnthresh, p->detquant, sn->size);
+      if( asprintf(&msg, "Pseudo-det S/N: %.2f (%.2f quant of %zu).",
+                   p->detsnthresh, p->detquant, sn->size)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 2);
       free(msg);
     }
@@ -1099,8 +1105,9 @@ detection(struct noisechiselparams *p)
   threshold_apply(p, p->sky->array, p->std->array, THRESHOLD_SKY_STD);
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "Pseudo-detection thresh (%.3f sigma) applied.",
-               p->dthresh);
+      if( asprintf(&msg, "Pseudo-detection thresh (%.3f sigma) applied.",
+                   p->dthresh)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 2);
       free(msg);
     }
@@ -1117,8 +1124,9 @@ detection(struct noisechiselparams *p)
   num_true_initial=detection_remove_false_initial(p, workbin);
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "%zu false initial detections removed.",
-               p->numinitialdets - num_true_initial);
+      if( asprintf(&msg, "%zu false initial detections removed.",
+                   p->numinitialdets - num_true_initial)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 2);
       free(msg);
     }
@@ -1132,10 +1140,17 @@ detection(struct noisechiselparams *p)
   if(!p->cp.quiet)
     {
       if(p->detgrowquant==1.0f)
-        asprintf(&msg, "%zu detections with no growth.", num_true_initial);
+        {
+          if( asprintf(&msg, "%zu detections with no growth.",
+                       num_true_initial)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       else
-        asprintf(&msg, "%zu detections after growth to %.3f quantile.",
-                 num_true_initial, p->detgrowquant);
+        {
+          if( asprintf(&msg, "%zu detections after growth to %.3f quantile.",
+                       num_true_initial, p->detgrowquant)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       gal_timing_report(&t1, msg, 2);
       free(msg);
     }
@@ -1153,7 +1168,8 @@ detection(struct noisechiselparams *p)
                        : num_true_initial );
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "%zu final true detections.", p->numdetections);
+      if( asprintf(&msg, "%zu final true detections.", p->numdetections)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t0, msg, 1);
       free(msg);
     }
diff --git a/bin/noisechisel/detection.h b/bin/noisechisel/detection.h
index ed2a100..df679b1 100644
--- a/bin/noisechisel/detection.h
+++ b/bin/noisechisel/detection.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/main.c b/bin/noisechisel/main.c
index dcdb43e..c49c91b 100644
--- a/bin/noisechisel/main.c
+++ b/bin/noisechisel/main.c
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/main.h b/bin/noisechisel/main.h
index 2f17f2f..003cacc 100644
--- a/bin/noisechisel/main.h
+++ b/bin/noisechisel/main.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/noisechisel.c b/bin/noisechisel/noisechisel.c
index f417454..2a67232 100644
--- a/bin/noisechisel/noisechisel.c
+++ b/bin/noisechisel/noisechisel.c
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/noisechisel.h b/bin/noisechisel/noisechisel.h
index b1a41d1..6fb6459 100644
--- a/bin/noisechisel/noisechisel.h
+++ b/bin/noisechisel/noisechisel.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/segmentation.c b/bin/noisechisel/segmentation.c
index 74908ef..3111a5b 100644
--- a/bin/noisechisel/segmentation.c
+++ b/bin/noisechisel/segmentation.c
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -593,8 +593,9 @@ segmentation_save_sn_table(struct clumps_params *clprm)
   /* Write the comments. */
   gal_list_str_add(&comments, "See also: `CLUMPS_ALL_DET' HDU of "
                    "output with `--checksegmentation'.", 1);
-  asprintf(&msg, "S/N values of `nan': clumps smaller than `--segsnminarea' "
-           "of %zu.", p->segsnminarea);
+  if( asprintf(&msg, "S/N values of `nan': clumps smaller than "
+               "`--segsnminarea' of %zu.", p->segsnminarea)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_str_add(&comments, msg, 0);
   gal_list_str_add(&comments, "S/N of clumps over detected regions.", 1);
   gal_table_comments_add_intro(&comments, PROGRAM_STRING, &p->rawtime);
@@ -687,8 +688,10 @@ segmentation_detections(struct noisechiselparams *p)
               demo->name = "DET_CLUMPS_ALL";
               if(!p->cp.quiet)
                 {
-                  asprintf(&msg, "Identified clumps over detections  "
-                           "(HDU: `%s').", demo->name);
+                  if( asprintf(&msg, "Identified clumps over detections  "
+                               "(HDU: `%s').", demo->name)<0 )
+                    error(EXIT_FAILURE, 0, "%s: asprintf allocation",
+                          __func__);
                   gal_timing_report(NULL, msg, 2);
                   free(msg);
                 }
@@ -699,8 +702,10 @@ segmentation_detections(struct noisechiselparams *p)
               demo->name = "DET_CLUMPS_TRUE";
               if(!p->cp.quiet)
                 {
-                  asprintf(&msg, "True clumps found                  "
-                           "(HDU: `%s').", demo->name);
+                  if( asprintf(&msg, "True clumps found                  "
+                               "(HDU: `%s').", demo->name)<0 )
+                    error(EXIT_FAILURE, 0, "%s: asprintf allocation",
+                          __func__);
                   gal_timing_report(NULL, msg, 2);
                   free(msg);
                 }
@@ -712,8 +717,10 @@ segmentation_detections(struct noisechiselparams *p)
               if(!p->cp.quiet)
                 {
                   gal_timing_report(NULL, "Starting to identify objects.", 1);
-                  asprintf(&msg, "True clumps grown                  "
-                           "(HDU: `%s').", demo->name);
+                  if( asprintf(&msg, "True clumps grown                  "
+                               "(HDU: `%s').", demo->name)<0 )
+                    error(EXIT_FAILURE, 0, "%s: asprintf allocation",
+                          __func__);
                   gal_timing_report(NULL, msg, 2);
                   free(msg);
                 }
@@ -724,8 +731,10 @@ segmentation_detections(struct noisechiselparams *p)
               demo->name = "DET_OBJ_IDENTIFIED";
               if(!p->cp.quiet)
                 {
-                  asprintf(&msg, "Identified objects over detections "
-                           "(HDU: `%s').", demo->name);
+                  if( asprintf(&msg, "Identified objects over detections "
+                               "(HDU: `%s').", demo->name)<0 )
+                    error(EXIT_FAILURE, 0, "%s: asprintf allocation",
+                          __func__);
                   gal_timing_report(NULL, msg, 2);
                   free(msg);
                 }
@@ -736,8 +745,10 @@ segmentation_detections(struct noisechiselparams *p)
               demo->name = "DET_OBJECTS_FULL";
               if(!p->cp.quiet)
                 {
-                  asprintf(&msg, "Objects grown to cover full area   "
-                           "(HDU: `%s').", demo->name);
+                  if( asprintf(&msg, "Objects grown to cover full area   "
+                               "(HDU: `%s').", demo->name)<0 )
+                    error(EXIT_FAILURE, 0, "%s: asprintf allocation",
+                          __func__);
                   gal_timing_report(NULL, msg, 2);
                   free(msg);
                 }
@@ -748,8 +759,10 @@ segmentation_detections(struct noisechiselparams *p)
               demo->name = "CLUMPS_FINAL";
               if(!p->cp.quiet)
                 {
-                  asprintf(&msg, "Clumps given their final label     "
-                           "(HDU: `%s').", demo->name);
+                  if( asprintf(&msg, "Clumps given their final label     "
+                               "(HDU: `%s').", demo->name)<0 )
+                    error(EXIT_FAILURE, 0, "%s: asprintf allocation",
+                          __func__);
                   gal_timing_report(NULL, msg, 2);
                   free(msg);
                 }
@@ -760,8 +773,10 @@ segmentation_detections(struct noisechiselparams *p)
               demo->name = "OBJECTS_FINAL";
               if(!p->cp.quiet)
                 {
-                  asprintf(&msg, "Objects given their final label    "
-                           "(HDU: `%s').", demo->name);
+                  if( asprintf(&msg, "Objects given their final label    "
+                               "(HDU: `%s').", demo->name)<0 )
+                    error(EXIT_FAILURE, 0, "%s: asprintf allocation",
+                          __func__);
                   gal_timing_report(NULL, msg, 2);
                   free(msg);
                 }
@@ -896,9 +911,10 @@ segmentation(struct noisechiselparams *p)
   /* Report the results and timing to the user. */
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "%zu object%s""containing %zu clump%sfound.",
-               p->numobjects, p->numobjects==1 ? " " : "s ",
-               p->numclumps,  p->numclumps ==1 ? " " : "s ");
+      if( asprintf(&msg, "%zu object%s""containing %zu clump%sfound.",
+                   p->numobjects, p->numobjects==1 ? " " : "s ",
+                   p->numclumps,  p->numclumps ==1 ? " " : "s ")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 1);
       free(msg);
     }
diff --git a/bin/noisechisel/segmentation.h b/bin/noisechisel/segmentation.h
index a9f4c38..6e17401 100644
--- a/bin/noisechisel/segmentation.h
+++ b/bin/noisechisel/segmentation.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/sky.c b/bin/noisechisel/sky.c
index 23ac8da..b9beee8 100644
--- a/bin/noisechisel/sky.c
+++ b/bin/noisechisel/sky.c
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/sky.h b/bin/noisechisel/sky.h
index 08a7d36..faf6502 100644
--- a/bin/noisechisel/sky.h
+++ b/bin/noisechisel/sky.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/threshold.c b/bin/noisechisel/threshold.c
index c3d3729..d55c9ae 100644
--- a/bin/noisechisel/threshold.c
+++ b/bin/noisechisel/threshold.c
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -759,8 +759,9 @@ threshold_quantile_find_apply(struct noisechiselparams *p)
   gal_data_free(qprm.noerode_th);
   if(!p->cp.quiet)
     {
-      asprintf(&msg, "%.2f & %0.2f quantile thresholds applied.",
-               p->qthresh, p->noerodequant);
+      if( asprintf(&msg, "%.2f & %0.2f quantile thresholds applied.",
+                   p->qthresh, p->noerodequant)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 2);
       free(msg);
     }
diff --git a/bin/noisechisel/threshold.h b/bin/noisechisel/threshold.h
index 595fa11..66b18c4 100644
--- a/bin/noisechisel/threshold.h
+++ b/bin/noisechisel/threshold.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/noisechisel/ui.c b/bin/noisechisel/ui.c
index 222ca56..455fc2c 100644
--- a/bin/noisechisel/ui.c
+++ b/bin/noisechisel/ui.c
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -889,8 +889,16 @@ ui_abort_after_check(struct noisechiselparams *p, char 
*filename,
 {
   char *name;
 
-  if(file2name) asprintf(&name, "`%s' and `%s'", filename, file2name);
-  else          asprintf(&name, "`%s'", filename);
+  if(file2name)
+    {
+      if( asprintf(&name, "`%s' and `%s'", filename, file2name)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
+  else
+    {
+      if( asprintf(&name, "`%s'", filename)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
 
   /* Let the user know that NoiseChisel is aborting. */
   fprintf(stderr,
diff --git a/bin/noisechisel/ui.h b/bin/noisechisel/ui.h
index ec3fe82..d20c2d3 100644
--- a/bin/noisechisel/ui.h
+++ b/bin/noisechisel/ui.h
@@ -3,9 +3,9 @@ NoiseChisel - Detect and segment signal in a noisy dataset.
 NoiseChisel is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/statistics/Makefile.am b/bin/statistics/Makefile.am
index 36eb9cc..bd8e1c1 100644
--- a/bin/statistics/Makefile.am
+++ b/bin/statistics/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/statistics/args.h b/bin/statistics/args.h
index 12cfc2d..227540f 100644
--- a/bin/statistics/args.h
+++ b/bin/statistics/args.h
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/statistics/authors-cite.h b/bin/statistics/authors-cite.h
index 0cdee03..33d059e 100644
--- a/bin/statistics/authors-cite.h
+++ b/bin/statistics/authors-cite.h
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/statistics/main.c b/bin/statistics/main.c
index 1bf4f9a..427d07e 100644
--- a/bin/statistics/main.c
+++ b/bin/statistics/main.c
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/statistics/main.h b/bin/statistics/main.h
index 5c115dd..4557a6b 100644
--- a/bin/statistics/main.h
+++ b/bin/statistics/main.h
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/statistics/sky.c b/bin/statistics/sky.c
index 098338f..a77d70a 100644
--- a/bin/statistics/sky.c
+++ b/bin/statistics/sky.c
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -184,8 +184,9 @@ sky(struct statisticsparams *p)
   if(!cp->quiet)
     {
       num=gal_statistics_number(p->sky_t);
-      asprintf(&msg, "Sky and its STD found on %zu/%zu tiles.",
-               (size_t)(*((uint64_t *)(num->array))), tl->tottiles );
+      if( asprintf(&msg, "Sky and its STD found on %zu/%zu tiles.",
+                   (size_t)(*((uint64_t *)(num->array))), tl->tottiles )<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(&t1, msg, 1);
       gal_data_free(num);
       free(msg);
diff --git a/bin/statistics/sky.h b/bin/statistics/sky.h
index 3cdb2e1..1a26ca5 100644
--- a/bin/statistics/sky.h
+++ b/bin/statistics/sky.h
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/statistics/statistics.c b/bin/statistics/statistics.c
index c5e05d1..42a80dc 100644
--- a/bin/statistics/statistics.c
+++ b/bin/statistics/statistics.c
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -538,7 +538,8 @@ write_output_table(struct statisticsparams *p, gal_data_t 
*table,
           ? gal_fits_name_is_fits(p->cp.output) ? "fits" : "txt"
           : "txt" );
   if(use_auto_output)
-    asprintf(&suffix, "%s.%s", suf, fix);
+    if( asprintf(&suffix, "%s.%s", suf, fix)<0 )
+      error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
 
 
   /* Make the output name. */
@@ -553,7 +554,8 @@ write_output_table(struct statisticsparams *p, gal_data_t 
*table,
   tmp=gal_fits_name_save_as_string(p->inputname, p->cp.hdu);
   gal_list_str_add(&comments, tmp, 0);
 
-  asprintf(&tmp, "%s created from:", contents);
+  if( asprintf(&tmp, "%s created from:", contents)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   gal_list_str_add(&comments, tmp, 0);
 
   if(strcmp(fix, "fits"))  /* The intro info will be in FITS files anyway.*/
@@ -720,12 +722,21 @@ print_input_info(struct statisticsparams *p)
   /* Range. */
   str=NULL;
   if( !isnan(p->greaterequal) && !isnan(p->lessthan) )
-    asprintf(&str, "from (inclusive) %g, up to (exclusive) %g",
-             p->greaterequal, p->lessthan);
+    {
+      if( asprintf(&str, "from (inclusive) %g, up to (exclusive) %g",
+                   p->greaterequal, p->lessthan)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
   else if( !isnan(p->greaterequal) )
-    asprintf(&str, "from (inclusive) %g", p->greaterequal);
+    {
+      if( asprintf(&str, "from (inclusive) %g", p->greaterequal)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
   else if( !isnan(p->lessthan) )
-    asprintf(&str, "up to (exclusive) %g", p->lessthan);
+    {
+      if( asprintf(&str, "up to (exclusive) %g", p->lessthan)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
   if(str)
     {
       printf("Range: ");
@@ -861,10 +872,16 @@ print_sigma_clip(struct statisticsparams *p)
 
   /* Set the mode for printing: */
   if( p->sclipparams[1]>=1.0f )
-    asprintf(&mode, "for %g clips", p->sclipparams[1]);
+    {
+      if( asprintf(&mode, "for %g clips", p->sclipparams[1])<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
   else
-    asprintf(&mode, "until relative change in STD is less than %g",
-             p->sclipparams[1]);
+    {
+      if( asprintf(&mode, "until relative change in STD is less than %g",
+                   p->sclipparams[1])<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
 
   /* Report the status */
   if(!p->cp.quiet)
diff --git a/bin/statistics/statistics.h b/bin/statistics/statistics.h
index bc7b59a..8bc7455 100644
--- a/bin/statistics/statistics.h
+++ b/bin/statistics/statistics.h
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/statistics/ui.c b/bin/statistics/ui.c
index 4187afc..4c4b652 100644
--- a/bin/statistics/ui.c
+++ b/bin/statistics/ui.c
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -296,8 +296,16 @@ ui_read_quantile_range(struct argp_option *option, char 
*arg,
   /* For the `--printparams' (`-P') option:*/
   if(lineno==-1)
     {
-      if( isnan(p->quantmax) ) asprintf(&str, "%g", p->quantmin);
-      else     asprintf(&str, "%g,%g", p->quantmin, p->quantmax);
+      if( isnan(p->quantmax) )
+        {
+          if( asprintf(&str, "%g", p->quantmin)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&str, "%g,%g", p->quantmin, p->quantmax)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       return str;
     }
 
@@ -524,7 +532,8 @@ ui_check_options_and_arguments(struct statisticsparams *p)
                       "to tables.", p->inputname, p->cp.hdu);
             }
           else if(p->column==NULL)
-            asprintf(&name, "%s (hdu: %s)", p->inputname, p->cp.hdu);
+            if( asprintf(&name, "%s (hdu: %s)", p->inputname, p->cp.hdu)<0 )
+              error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
         }
 
       /* If its not FITS, it must be a table. */
diff --git a/bin/statistics/ui.h b/bin/statistics/ui.h
index 64b4cea..3e96f5b 100644
--- a/bin/statistics/ui.h
+++ b/bin/statistics/ui.h
@@ -3,9 +3,9 @@ Statistics - Statistical analysis on input dataset.
 Statistics is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/table/Makefile.am b/bin/table/Makefile.am
index 75eea69..ddedf1b 100644
--- a/bin/table/Makefile.am
+++ b/bin/table/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2016, Free Software Foundation, Inc.
+## Copyright (C) 2016-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/table/args.h b/bin/table/args.h
index 8ee1cb7..f67bcb5 100644
--- a/bin/table/args.h
+++ b/bin/table/args.h
@@ -3,9 +3,9 @@ Table - View and manipulate a FITS table structures.
 Table is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/table/authors-cite.h b/bin/table/authors-cite.h
index 242282a..883ceff 100644
--- a/bin/table/authors-cite.h
+++ b/bin/table/authors-cite.h
@@ -3,9 +3,9 @@ Table - View and manipulate a FITS table structures.
 Table is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/table/main.c b/bin/table/main.c
index 5c374ca..8255275 100644
--- a/bin/table/main.c
+++ b/bin/table/main.c
@@ -3,9 +3,9 @@ Table - View and manipulate a FITS table structures.
 Table is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/table/main.h b/bin/table/main.h
index 76ad9a4..bbd8288 100644
--- a/bin/table/main.h
+++ b/bin/table/main.h
@@ -3,9 +3,9 @@ Table - View and manipulate a FITS table structures.
 Table is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/table/table.c b/bin/table/table.c
index 7326ce3..2411467 100644
--- a/bin/table/table.c
+++ b/bin/table/table.c
@@ -3,9 +3,9 @@ Table - View and manipulate a FITS table structures.
 Table is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/table/table.h b/bin/table/table.h
index e28f32e..1f43013 100644
--- a/bin/table/table.h
+++ b/bin/table/table.h
@@ -3,9 +3,9 @@ Table - View and manipulate a FITS table structures.
 Table is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/table/ui.c b/bin/table/ui.c
index 860d4ad..58949e4 100644
--- a/bin/table/ui.c
+++ b/bin/table/ui.c
@@ -3,9 +3,9 @@ Table - View and manipulate a FITS table structures.
 Table is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/table/ui.h b/bin/table/ui.h
index 15f4bbb..1402ee3 100644
--- a/bin/table/ui.h
+++ b/bin/table/ui.h
@@ -3,9 +3,9 @@ Table - View and manipulate a FITS table structures.
 Table is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/warp/Makefile.am b/bin/warp/Makefile.am
index 416e959..cfccc1b 100644
--- a/bin/warp/Makefile.am
+++ b/bin/warp/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/bin/warp/args.h b/bin/warp/args.h
index 2c028a6..8c1e9ab 100644
--- a/bin/warp/args.h
+++ b/bin/warp/args.h
@@ -3,9 +3,9 @@ Warp - Warp images using projective mapping.
 Warp is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/warp/authors-cite.h b/bin/warp/authors-cite.h
index 34c89d5..733a1d2 100644
--- a/bin/warp/authors-cite.h
+++ b/bin/warp/authors-cite.h
@@ -3,9 +3,9 @@ Warp - Warp images using projective mapping.
 Warp is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/warp/main.c b/bin/warp/main.c
index ef9f260..8368336 100644
--- a/bin/warp/main.c
+++ b/bin/warp/main.c
@@ -3,9 +3,9 @@ Warp - Warp images using projective mapping.
 Warp is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/warp/main.h b/bin/warp/main.h
index 6c544ea..d8727fe 100644
--- a/bin/warp/main.h
+++ b/bin/warp/main.h
@@ -3,9 +3,9 @@ Warp - Warp images using projective mapping.
 Warp is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/warp/ui.c b/bin/warp/ui.c
index a830b0b..742d6c7 100644
--- a/bin/warp/ui.c
+++ b/bin/warp/ui.c
@@ -3,9 +3,9 @@ Warp - Warp images using projective mapping.
 Warp is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/warp/ui.h b/bin/warp/ui.h
index f78f203..7dd3a6b 100644
--- a/bin/warp/ui.h
+++ b/bin/warp/ui.h
@@ -3,9 +3,9 @@ Warp - Warp images using projective mapping.
 Warp is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/warp/warp.c b/bin/warp/warp.c
index b22e63f..77ddd6c 100644
--- a/bin/warp/warp.c
+++ b/bin/warp/warp.c
@@ -3,9 +3,9 @@ Warp - Warp images using projective mapping.
 Warp is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bin/warp/warp.h b/bin/warp/warp.h
index 9e48dd4..c1e7cf3 100644
--- a/bin/warp/warp.h
+++ b/bin/warp/warp.h
@@ -3,9 +3,9 @@ Warp - Warp images using projective mapping.
 Warp is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/bootstrap.conf b/bootstrap.conf
index f593304..ff1cecd 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -17,8 +17,8 @@
 # Original author:
 #     Mosè Giordano <mose@gnu.org>
 # Contributing author(s):
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
-# Copyright (C) 2016 Free Software Foundation, Inc.
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
+# Copyright (C) 2016-2018 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/configure.ac b/configure.ac
index 35c9ae5..c169f54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,9 @@
 # we don't need to explicitly call that directory here.
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
-# Copyright (C) 2015 - 2016, Free Software Foundation, Inc.
+# Copyright (C) 2015-2018, Free Software Foundation, Inc.
 #
 # Gnuastro is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ AC_CONFIG_MACRO_DIRS([bootstrapped/m4])
 
 # Library version, see the GNU Libtool manual ("Library interface versions"
 # section for the exact definition of each) for
-GAL_CURRENT=3
+GAL_CURRENT=4
 GAL_REVISION=0
 GAL_AGE=0
 GAL_LT_VERSION="${GAL_CURRENT}:${GAL_REVISION}:${GAL_AGE}"
@@ -87,6 +87,16 @@ AC_DEFINE([IN_GNUASTRO_BUILD], [1], [In building, not usage])
 
 
 
+# If any specific CPPFLAGS and LDFLAGS are given, we need to keep the raw
+# values (before they are changed in the next step) to pass onto
+# BuildProgram (which also needs them).
+AC_SUBST(IN_LDFLAGS, "$LDFLAGS")
+AC_SUBST(IN_CPPFLAGS, "$CPPFLAGS")
+
+
+
+
+
 # Generic compiler flags for all sub-directories.
 CFLAGS="-Wall -O3 $CFLAGS"
 CXXFLAGS="-Wall -O3 $CXXFLAGS"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 94b80d3..a18dce2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,9 +4,9 @@
 ## called by the Makefile.am in the top directory.
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## GNU Astronomy Utilities is free software: you can redistribute it
 ## and/or modify it under the terms of the GNU General Public License
diff --git a/doc/announce-acknowledge.txt b/doc/announce-acknowledge.txt
index 8daf72e..8d8f500 100644
--- a/doc/announce-acknowledge.txt
+++ b/doc/announce-acknowledge.txt
@@ -3,3 +3,6 @@ People who's help must be acknowledged in the next release.
 Antonio Diaz Diaz
 Guillaume Mahler
 Ole Streicher
+Michel Tallon
+Juan C. Tello
+Éric Thiébaut
diff --git a/doc/fonts.css b/doc/fonts.css
index c771ad6..008126c 100644
--- a/doc/fonts.css
+++ b/doc/fonts.css
@@ -1,9 +1,9 @@
 /* CSS stylesheet for webfonts in Gnuastro's manual webpage.
 
 Original author:
-    Mohammad Akhlaghi <akhlaghi@gnu.org>
+    Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016 Free Software Foundation, Inc.
+Copyright (C) 2016-2018 Free Software Foundation, Inc.
 
 This stylesheet is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public Licence as
diff --git a/doc/forwebpage b/doc/forwebpage
index 19a8376..e70dafe 100755
--- a/doc/forwebpage
+++ b/doc/forwebpage
@@ -74,9 +74,9 @@
 #"
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
-# Copyright (C) 2016, Free Software Foundation, Inc.
+# Copyright (C) 2016-2018, Free Software Foundation, Inc.
 #
 # Gnuastro is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
diff --git a/doc/genauthors b/doc/genauthors
index 030b067..da1a9f8 100755
--- a/doc/genauthors
+++ b/doc/genauthors
@@ -10,10 +10,10 @@
 #     genauthors TOP_SRCDIR
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #     Mosè Giordano <mose@gnu.org>
-# Copyright (C) 2016, Free Software Foundation, Inc.
+# Copyright (C) 2016-2018, Free Software Foundation, Inc.
 #
 # Gnuastro is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
diff --git a/doc/gnuastro.en.html b/doc/gnuastro.en.html
index aaa7930..5f23131 100644
--- a/doc/gnuastro.en.html
+++ b/doc/gnuastro.en.html
@@ -43,6 +43,7 @@ h3 { clear: both; }
   <li><a href="#mail">Gnuastro mailing lists</a></li>
   <li><a href="#bug">Report a Bug</a></li>
   <li><a href="#contribute">Getting involved</a></li>
+  <li><a href="#cite">How to cite</a></li>
   <li><a href="#license">Licensing</a></li>
 </ul>
 <hr class="no-display"/>
@@ -325,6 +326,38 @@ Please use the mailing lists for contact. </dd>
 
 
 
+<h3 id="cite">How to cite</h3>
+
+<p>Citations are vital for the continued work on Gnuastro. All the programs
+  accept the common <code>--cite</code> option which will guide you on how
+  to properly cite and acknowledge the work that has gone into creating and
+  maintaining that particular program and Gnuastro in general. If any of
+  the programs or libraries offered in Gnuastro are useful in your
+  research, please use the output of this option to cite the program and
+  Gnuastro in your research paper. Note that different programs may require
+  citation of different papers specifically devoted to them.</p>
+
+<p>Gnuastro is still new, thus there is no paper fully devoted to
+  introducing it and its capabilities yet. Until then, the paper to cite
+  for Gnuastro in general is the paper which introduced NoiseChisel
+  (<a href="http://adsabs.harvard.edu/abs/2015ApJS..220....1A";>ApJS 220,
+  1</a>). It was the first published paper using Gnuastro. Upon reaching a
+  certain point, a paper completely devoted to Gnuastro will be published,
+  see <a 
href="https://www.gnu.org/software/gnuastro/manual/html_node/GNU-Astronomy-Utilities-1_002e0.html";>GNU
+  Astronomy Utilities 1.0</a>.</p>
+
+<p>Gnuastro is also registered on the Astrophysics Source Code Library
+  (<a href="http://ascl.net";>ASCL</a>)
+  with <a href="http://ascl.net/1801.009";>ascl.net/1801.009</a>. Please use
+  this identifier somewhere in the body of your paper (for example in the
+  acknowledgments or first mention of Gnuastro). For the
+  bibliography/references list at the end of the paper, please only use the
+  papers listed in the output of <code>--cite</code>.</p>
+
+
+
+
+
 <h3 id="license">Licensing</h3>
 
 <p>GNU Astronomy Utilities (Gnuastro) is free software; you can
diff --git a/doc/gnuastro.fr.html b/doc/gnuastro.fr.html
index e6faa39..93750b0 100644
--- a/doc/gnuastro.fr.html
+++ b/doc/gnuastro.fr.html
@@ -301,8 +301,8 @@ h3 { clear: both; }
   elle fonctionne)&nbsp;:
 
   <pre class="emph-box">
-git clone git://git.sv.gnu.org/gnuastro git
-clone http://git.sv.gnu.org/r/gnuastro.git</pre>
+git clone git://git.sv.gnu.org/gnuastro.git
+git clone http://git.sv.gnu.org/r/gnuastro.git</pre>
 </dd>
 
 <dd>Pour configurer et compiler les sources sous contrôle de version, vous
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index ece2e57..b2adc79 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -29,7 +29,7 @@ This book documents version @value{VERSION} of the GNU 
Astronomy Utilities
 (Gnuastro). Gnuastro provides various programs and libraries for
 astronomical data manipulation and analysis.
 
-Copyright @copyright{} 2015-2017 Free Software Foundation, Inc.
+Copyright @copyright{} 2015-2018 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document under
@@ -81,6 +81,9 @@ License''.
 * MakeProfiles: (gnuastro)MakeProfiles. Make mock profiles.
 * astmkprof: (gnuastro)Invoking astmkprof. Options to MakeProfiles.
 
+* Match: (gnuastro)Match. Match two separate catalogs.
+* astmatch: (gnuastro)Invoking astmatch. Options to Match.
+
 * NoiseChisel: (gnuastro)NoiseChisel. Detect signal in noise.
 * astnoisechisel: (gnuastro)Invoking astnoisechisel. Options to NoiseChisel.
 
@@ -735,7 +738,12 @@ Let's assume the downloaded tarball is in the 
@file{TOPGNUASTRO}
 directory. The first two commands below can be used to decompress the
 source. If you download @file{tar.lz} and your Tar implementation doesn't
 recognize Lzip (the second command fails), run the third and fourth
-lines. Note that lines starting with @code{##} don't need to be typed.
+lines@footnote{In case Tar doesn't directly uncompress your @file{.tar.lz}
+tarball, you can merge the separate calls to Lzip and Tar (shown in the
+main body of text) into one command by directly piping the output of Lzip
+into Tar with a command like this: @command{$ lzip -cd gnuastro-0.5.tar.lz
+| tar -xf -}}. Note that lines starting with @code{##} don't need to be
+typed.
 
 @example
 ## Go into the download directory.
@@ -948,7 +956,7 @@ looked for in the sixth place of decimals.
 If scientists are considered to be more than mere ``puzzle
 solvers''@footnote{Thomas S. Kuhn. @emph{The Structure of Scientific
 Revolutions}, University of Chicago Press, 1962.} (simply adding to
-the decimals of known values or observing a feature in 10, 100, or
+the decimals of existing values or observing a feature in 10, 100, or
 100000 more galaxies or stars, as Kelvin and Michelson clearly
 believed), they cannot just passively sit back and uncritically repeat
 the previous (observational or theoretical) methods/tools on new
@@ -3080,8 +3088,8 @@ $ astfits noisechisel/xdf-f160w.fits -h2                  
           \
 
 Grep and AWK are simple, but very powerful command-line software for
 processing text files. Learning them properly can greatly simplify your
-processing, while improve your creativity, productivity and speed. When you
-get time, it is highly recommended to master them. The most common
+processing, while improving your creativity, productivity and speed. When
+you get time, it is highly recommended to master them. The most common
 implementation of both is from GNU. Like almost all GNU software, both GNU
 Grep and GNU AWK have wonderful manuals which come with the program for
 free. You don't have to read the whole manual at once, they both start with
@@ -3794,13 +3802,30 @@ old@footnote{As of early June 2016, its most recent 
version was uploaded in
 February 2001.}, so its installation is not easy, there are also many great
 modern WCS plotting tools (mostly in written in Python). Hence, if you will
 not be using those plotting functions in WCSLIB, you can configure it with
-the @option{--without-pgplot} option as shown below. Let's assume you have
-downloaded @url{ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2,
-@file{wcslib.tar.bz2}} and are in the same directory:
+the @option{--without-pgplot} option as shown below.
+
+If you have the cURL library @footnote{@url{https://curl.haxx.se}} on your
+system and you installed CFITSIO version 3.42 or later, you will need to
+also link with the cURL library at configure time (through the
+@code{-lcurl} option as shown below). CFITSIO uses the cURL library for its
+HTTPS (or HTTP Secure@footnote{@url{https://en.wikipedia.org/wiki/HTTPS}})
+support and if it is present on your system, CFITSIO will depend on
+it. Therefore, if @command{./configure} command below fails (you don't have
+the cURL library), then remove this option and rerun it.
+
+Let's assume you have downloaded
+@url{ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2,
+@file{wcslib.tar.bz2}} and are in the same directory, to configure, build,
+check and install WCSLIB follow the steps below.
 @example
 $ tar xf wcslib.tar.bz2
-$ cd wcslib-X.X                    # Replace X.X with version number
-$ ./configure --without-pgplot LIBS="-pthread -lm" --disable-fortran
+
+## In the `cd' command, replace `X.X' with version number.
+$ cd wcslib-X.X
+
+## If `./configure' fails, remove `-lcurl' and run again.
+$ ./configure LIBS="-pthread -lcurl -lm" --without-pgplot     \
+              --disable-fortran
 $ make
 $ make check
 $ sudo make install
@@ -3808,7 +3833,6 @@ $ sudo make install
 
 
 
-
 @node Optional dependencies, Bootstrapping dependencies, Mandatory 
dependencies, Dependencies
 @subsection Optional dependencies
 
@@ -5255,18 +5279,23 @@ re-configure Gnuastro, then re-run make.
 @cindex Tests, only one passes
 @cindex @file{LD_LIBRARY_PATH}
 @item
-@command{$ make check}: @emph{Only one @file{.sh} test passes, all the rest
-fail.}  It is highly likely that your distribution doesn't look into the
-@file{/usr/local/lib} directory when searching for shared libraries. To
-make sure it is added to the list of directories, run the following command
-and restart your terminal: (you can ignore the @command{\} and extra space
-if you type it, it is only necessary if you copy and paste). See
-@ref{Installation directory} for more details.
+@command{$ make check}: @emph{Only the first couple of tests pass, all the
+rest fail or get skipped.}  It is highly likely that when searching for
+shared libraries, your system doesn't look into the @file{/usr/local/lib}
+directory (or wherever you installed Gnuastro or its dependencies). To make
+sure it is added to the list of directories, add the following line to your
+@file{~/.bashrc} file and restart your terminal. Don't forget to change
+@file{/usr/local/lib} if the libraries are installed in other
+(non-standard) directories.
+
 @example
-echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib' \
-     >> ~/.bashrc
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 @end example
 
+You can also add more directories by using a colon `@code{:}' to separate
+them. See @ref{Installation directory} and @ref{Linking} to learn more on
+the @code{PATH} variables and dynamic linking respectively.
+
 @cindex GPL Ghostscript
 @item
 @command{$ make check}: @emph{The tests relying on external programs
@@ -17237,7 +17266,7 @@ A circular Gaussian kernel with FWHM of 2 pixels and 
truncated at 3 times
 the FWHM.
 @end table
 
-This option may also be used to create a 3D kernel. To do that, to small
+This option may also be used to create a 3D kernel. To do that, two small
 modifications are necessary: add a @code{-3d} (or @code{-3D}) to the
 profile name (for example @code{moffat-3d}) and add a fraction (value
 between 0 and 1) to the end of the parameters for all profiles except
@@ -18816,8 +18845,8 @@ library, you might need another tool.} program, for 
example:
 $ ldd /usr/local/bin/astarithmetic
 @end example
 
-Library file names start with a @file{lib} and end with suffix depending on
-their type as described below. In between these two is the name of the
+Library file names start with a @file{lib} and end with a suffix depending
+on their type as described below. In between these two is the name of the
 library, for example @file{libgnuastro.a} (Gnuastro's static library) and
 @file{libgsl.so.0.0.0} (GSL's shared library).
 
@@ -18853,16 +18882,17 @@ the @file{prefix/lib/} directory (see 
@ref{Installation directory}). In
 this way other programs can make which ever kind of link that they want.
 
 To link with a library, the linker needs to know where to find the
-library. You do that with two separate options to the linker (see
-@ref{Summary and example on libraries} for an example):
+library. @emph{At compilation time}, these locations can be passed to the
+linker with two separate options (see @ref{Summary and example on
+libraries} for an example) as described below.
 
 @table @option
 @item -L DIR
 Will tell the linker to look into @file{DIR} for the libraries. For example
 @file{-L/usr/local/lib}, or @file{-L/home/yourname/.local/lib}. You can
 make multiple calls to this option, so the linker looks into several
-directories. Note that the space between @key{L} and the directory is
-optional and commonly not used.
+directories at compilation time. Note that the space between @key{L} and
+the directory is optional and commonly not used.
 
 @item -lLIBRARY
 Specify the unique name of a library to be linked. As discussed above,
@@ -18892,6 +18922,14 @@ the linker will complain and abort.
 
 @end table
 
+If you have compiled and linked your program with a dynamic library, then
+the linker needs to know the location of the libraries @emph{every time}
+the final program is run. For this purpose, the linker looks into the
+@code{LD_LIBRARY_PATH} environment variable. Therefore, if you don't get
+any errors when compiling/linking, but are unable to run your program
+because of a failure to find a library, it is because the linker hasn't
+found the dynamic library @emph{at run time}. See @ref{Installation
+directory} on how to add any directory to @code{LD_LIBRARY_PATH}.
 
 
 
diff --git a/doc/plotsrc/Makefile b/doc/plotsrc/Makefile
index f377300..2369082 100644
--- a/doc/plotsrc/Makefile
+++ b/doc/plotsrc/Makefile
@@ -1,9 +1,9 @@
 # Prepare all the figures for the GNU Astronomy Utilities manual.
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
-# Copyright (C) 2015, Free Software Foundation, Inc.
+# Copyright (C) 2015-2018, Free Software Foundation, Inc.
 #
 # GNU Astronomy Utilities is free software: you can redistribute it
 # and/or modify it under the terms of the GNU General Public License
diff --git a/doc/plotsrc/all.tex b/doc/plotsrc/all.tex
index 1700910..5a0f58f 100644
--- a/doc/plotsrc/all.tex
+++ b/doc/plotsrc/all.tex
@@ -3,9 +3,9 @@
 % you to compile this TeX file in the desired manner.
 %
 % Original author:
-%     Mohammad Akhlaghi <akhlaghi@gnu.org>
+%     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 % Contributing author(s):
-% Copyright (C) 2015, Free Software Foundation, Inc.
+% Copyright (C) 2015-2018, Free Software Foundation, Inc.
 %
 % Gnuastro is free software: you can redistribute it and/or modify it
 % under the terms of the GNU General Public License as published by
diff --git a/doc/plotsrc/conversions.sh b/doc/plotsrc/conversions.sh
index d39b322..bad65ec 100755
--- a/doc/plotsrc/conversions.sh
+++ b/doc/plotsrc/conversions.sh
@@ -11,9 +11,9 @@
 #
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
-# Copyright (C) 2015, Free Software Foundation, Inc.
+# Copyright (C) 2015-2018, Free Software Foundation, Inc.
 #
 # Gnuastro is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
diff --git a/doc/plotsrc/tex/flatplane.tex b/doc/plotsrc/tex/flatplane.tex
index 64a0926..eaef93c 100644
--- a/doc/plotsrc/tex/flatplane.tex
+++ b/doc/plotsrc/tex/flatplane.tex
@@ -3,9 +3,9 @@
 % you to compile this TeX file in the desired manner.
 %
 % Original author:
-%     Mohammad Akhlaghi <akhlaghi@gnu.org>
+%     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 % Contributing author(s):
-% Copyright (C) 2016, Free Software Foundation, Inc.
+% Copyright (C) 2016-2018, Free Software Foundation, Inc.
 %
 % Gnuastro is free software: you can redistribute it and/or modify it
 % under the terms of the GNU General Public License as published by
diff --git a/doc/plotsrc/tex/iandtime.tex b/doc/plotsrc/tex/iandtime.tex
index b2d33db..b1e96b7 100644
--- a/doc/plotsrc/tex/iandtime.tex
+++ b/doc/plotsrc/tex/iandtime.tex
@@ -3,9 +3,9 @@
 % you to compile this TeX file in the desired manner.
 %
 % Original author:
-%     Mohammad Akhlaghi <akhlaghi@gnu.org>
+%     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 % Contributing author(s):
-% Copyright (C) 2015, Free Software Foundation, Inc.
+% Copyright (C) 2015-2018, Free Software Foundation, Inc.
 %
 % Gnuastro is free software: you can redistribute it and/or modify it
 % under the terms of the GNU General Public License as published by
diff --git a/doc/plotsrc/tex/samplingfreq.tex b/doc/plotsrc/tex/samplingfreq.tex
index 1c16ede..9756018 100644
--- a/doc/plotsrc/tex/samplingfreq.tex
+++ b/doc/plotsrc/tex/samplingfreq.tex
@@ -3,9 +3,9 @@
 % you to compile this TeX file in the desired manner.
 %
 % Original author:
-%     Mohammad Akhlaghi <akhlaghi@gnu.org>
+%     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 % Contributing author(s):
-% Copyright (C) 2015, Free Software Foundation, Inc.
+% Copyright (C) 2015-2018, Free Software Foundation, Inc.
 %
 % Gnuastro is free software: you can redistribute it and/or modify it
 % under the terms of the GNU General Public License as published by
diff --git a/doc/plotsrc/tex/sphereandplane.tex 
b/doc/plotsrc/tex/sphereandplane.tex
index 68a7b0f..7b909c0 100644
--- a/doc/plotsrc/tex/sphereandplane.tex
+++ b/doc/plotsrc/tex/sphereandplane.tex
@@ -3,9 +3,9 @@
 % you to compile this TeX file in the desired manner.
 %
 % Original author:
-%     Mohammad Akhlaghi <akhlaghi@gnu.org>
+%     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 % Contributing author(s):
-% Copyright (C) 2016, Free Software Foundation, Inc.
+% Copyright (C) 2016-2018, Free Software Foundation, Inc.
 %
 % Gnuastro is free software: you can redistribute it and/or modify it
 % under the terms of the GNU General Public License as published by
diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt
index e771da1..3cf287f 100644
--- a/doc/release-checklist.txt
+++ b/doc/release-checklist.txt
@@ -191,7 +191,7 @@ Steps necessary to Package Gnuastro for Debian.
    following command. A `gnuastro' directory will be built, for the moment
    don't go in it.
 
-     $ git clone git://anonscm.debian.org/debian-astro/packages/gnuastro.git
+     $ git clone https://salsa.debian.org/debian-astro-team/gnuastro.git
 
 
  - If a Git directory exists, then pull any possible changes that already
@@ -215,9 +215,16 @@ Steps necessary to Package Gnuastro for Debian.
      $ export ver=A.B.CCC
 
 
- - Put a copy of the tarball to be packaged in this directory and make a
-   standard symbolic link to it (IMPORTANT: the `dash' is changed to an
-   `underscore' and an `orig' is added), then go into the cloned directory.
+ - Put a copy of the TARBALL and its SIGNATURE to be packaged in this
+   directory (use a different address for the experimental releases)
+
+     $ wget https://ftp.gnu.org/gnu/gnuastro/gnuastro-$ver.tar.gz
+     $ wget https://ftp.gnu.org/gnu/gnuastro/gnuastro-$ver.tar.gz.sig
+
+
+ - Make a standard symbolic link to the tarball (IMPORTANT: the `dash' is
+   changed to an `underscore' and an `orig' is added), then go into the
+   cloned directory.
 
      $ ln -s gnuastro-$ver-XXXX.tar.gz gnuastro_$ver.orig.tar.gz
      $ cd gnuastro
@@ -240,7 +247,8 @@ Steps necessary to Package Gnuastro for Debian.
      $ git add --all
      $ git commit -m "Upstream Gnuastro $ver"
      $ git tag upstream/$ver
-     $ pristine-tar -s commit ../gnuastro_$ver.orig.tar.gz
+     $ pristine-tar commit ../gnuastro_$ver.orig.tar.gz          \
+                    -s ../gnuastro-$ver.tar.gz.sig
 
 
  - We are done with the `upstream' and `pristine-tar' branches and can
diff --git a/doc/style.css b/doc/style.css
index 90a3934..6ccdb11 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -1,9 +1,9 @@
 /* CSS stylesheet for webfonts in Gnuastro's manual webpage.
 
 Original author:
-    Mohammad Akhlaghi <akhlaghi@gnu.org>
+    Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016 Free Software Foundation, Inc.
+Copyright (C) 2016-2018 Free Software Foundation, Inc.
 
 This stylesheet is free software: you can redistribute it and/or
 modify it under the terms of the GNU General Public Licence as
diff --git a/genauthors b/genauthors
index fff6538..c50d51a 100755
--- a/genauthors
+++ b/genauthors
@@ -14,9 +14,9 @@
 # of all the possible ways to do this.
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
-# Copyright (C) 2015, Free Software Foundation, Inc.
+# Copyright (C) 2015-2018, Free Software Foundation, Inc.
 #
 # Gnuastro is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0bef380..0ee4e9d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
diff --git a/lib/arithmetic-and.c b/lib/arithmetic-and.c
index aedc84a..bd00a61 100644
--- a/lib/arithmetic-and.c
+++ b/lib/arithmetic-and.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-bitand.c b/lib/arithmetic-bitand.c
index d307285..c8ffdcf 100644
--- a/lib/arithmetic-bitand.c
+++ b/lib/arithmetic-bitand.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-bitlsh.c b/lib/arithmetic-bitlsh.c
index 85538a1..b85d674 100644
--- a/lib/arithmetic-bitlsh.c
+++ b/lib/arithmetic-bitlsh.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-bitor.c b/lib/arithmetic-bitor.c
index 84ccea6..a42c1ec 100644
--- a/lib/arithmetic-bitor.c
+++ b/lib/arithmetic-bitor.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-bitrsh.c b/lib/arithmetic-bitrsh.c
index a4f7e84..ab21cc0 100644
--- a/lib/arithmetic-bitrsh.c
+++ b/lib/arithmetic-bitrsh.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-bitxor.c b/lib/arithmetic-bitxor.c
index 7df2f75..60073e3 100644
--- a/lib/arithmetic-bitxor.c
+++ b/lib/arithmetic-bitxor.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-divide.c b/lib/arithmetic-divide.c
index 146bac3..e69a21b 100644
--- a/lib/arithmetic-divide.c
+++ b/lib/arithmetic-divide.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-eq.c b/lib/arithmetic-eq.c
index 8ce458a..6ec7645 100644
--- a/lib/arithmetic-eq.c
+++ b/lib/arithmetic-eq.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-ge.c b/lib/arithmetic-ge.c
index 4f560af..1f1bb58 100644
--- a/lib/arithmetic-ge.c
+++ b/lib/arithmetic-ge.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-gt.c b/lib/arithmetic-gt.c
index f83deb7..b0d66ab 100644
--- a/lib/arithmetic-gt.c
+++ b/lib/arithmetic-gt.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-le.c b/lib/arithmetic-le.c
index 3d8f510..a34cd2d 100644
--- a/lib/arithmetic-le.c
+++ b/lib/arithmetic-le.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-lt.c b/lib/arithmetic-lt.c
index b99c874..ecd661c 100644
--- a/lib/arithmetic-lt.c
+++ b/lib/arithmetic-lt.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-minus.c b/lib/arithmetic-minus.c
index d88a0f6..2d11902 100644
--- a/lib/arithmetic-minus.c
+++ b/lib/arithmetic-minus.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-modulo.c b/lib/arithmetic-modulo.c
index f48db5e..862218f 100644
--- a/lib/arithmetic-modulo.c
+++ b/lib/arithmetic-modulo.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-multiply.c b/lib/arithmetic-multiply.c
index e060e36..a714b58 100644
--- a/lib/arithmetic-multiply.c
+++ b/lib/arithmetic-multiply.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-ne.c b/lib/arithmetic-ne.c
index 3182b15..ba97352 100644
--- a/lib/arithmetic-ne.c
+++ b/lib/arithmetic-ne.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-or.c b/lib/arithmetic-or.c
index 57be198..cd1dd41 100644
--- a/lib/arithmetic-or.c
+++ b/lib/arithmetic-or.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic-plus.c b/lib/arithmetic-plus.c
index 22c7caa..611d04d 100644
--- a/lib/arithmetic-plus.c
+++ b/lib/arithmetic-plus.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/arithmetic.c b/lib/arithmetic.c
index 878173c..42a2300 100644
--- a/lib/arithmetic.c
+++ b/lib/arithmetic.c
@@ -3,9 +3,9 @@ Arithmetic operations on data structures
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/binary.c b/lib/binary.c
index 98187a6..6df7026 100644
--- a/lib/binary.c
+++ b/lib/binary.c
@@ -3,9 +3,9 @@ binary -- Work on binary (0 and 1 valued) datasets.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/blank.c b/lib/blank.c
index b3550a9..98b69f3 100644
--- a/lib/blank.c
+++ b/lib/blank.c
@@ -3,9 +3,9 @@ blank -- Deal with blank values in a datasets
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -385,66 +385,154 @@ gal_blank_as_string(uint8_t type, int width)
       break;
 
     case GAL_TYPE_STRING:
-      if(width) asprintf(&blank, "%*s", width,  GAL_BLANK_STRING);
-      else      asprintf(&blank, "%s",          GAL_BLANK_STRING);
+      if(width)
+        {
+          if( asprintf(&blank, "%*s", width,  GAL_BLANK_STRING)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, "%s", GAL_BLANK_STRING)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_UINT8:
       fmt = width ? "%*"PRIu8 : "%"PRIu8;
-      if(width) asprintf(&blank, fmt, width, (uint8_t)GAL_BLANK_UINT8);
-      else      asprintf(&blank, fmt,        (uint8_t)GAL_BLANK_UINT8);
+      if(width)
+        {
+          if( asprintf(&blank, fmt, width, (uint8_t)GAL_BLANK_UINT8)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, fmt, (uint8_t)GAL_BLANK_UINT8)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_INT8:
       fmt = width ? "%*"PRId8 : "%"PRId8;
-      if(width) asprintf(&blank, fmt, width, (int8_t)GAL_BLANK_INT8);
-      else      asprintf(&blank, fmt,        (int8_t)GAL_BLANK_INT8);
+      if(width)
+        {
+          if( asprintf(&blank, fmt, width, (int8_t)GAL_BLANK_INT8)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, fmt, (int8_t)GAL_BLANK_INT8)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_UINT16:
       fmt = width ? "%*"PRIu16 : "%"PRIu16;
-      if(width) asprintf(&blank, fmt, width, (uint16_t)GAL_BLANK_UINT16);
-      else      asprintf(&blank, fmt,        (uint16_t)GAL_BLANK_UINT16);
+      if(width)
+        {
+          if( asprintf(&blank, fmt, width, (uint16_t)GAL_BLANK_UINT16)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, fmt, (uint16_t)GAL_BLANK_UINT16)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_INT16:
       fmt = width ? "%*"PRId16 : "%"PRId16;
-      if(width) asprintf(&blank, fmt, width, (int16_t)GAL_BLANK_INT16);
-      else      asprintf(&blank, fmt,        (int16_t)GAL_BLANK_INT16);
+      if(width)
+        {
+          if( asprintf(&blank, fmt, width, (int16_t)GAL_BLANK_INT16)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, fmt, (int16_t)GAL_BLANK_INT16)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_UINT32:
       fmt = width ? "%*"PRIu32 : "%"PRIu32;
-      if(width) asprintf(&blank, fmt, width, (uint32_t)GAL_BLANK_UINT32);
-      else      asprintf(&blank, fmt,        (uint32_t)GAL_BLANK_UINT32);
+      if(width)
+        {
+          if( asprintf(&blank, fmt, width, (uint32_t)GAL_BLANK_UINT32)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, fmt, (uint32_t)GAL_BLANK_UINT32)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_INT32:
       fmt = width ? "%*"PRId32 : "%"PRId32;
-      if(width) asprintf(&blank, fmt, width, (int32_t)GAL_BLANK_INT32);
-      else      asprintf(&blank, fmt,        (int32_t)GAL_BLANK_INT32);
+      if(width)
+        {
+          if( asprintf(&blank, fmt, width, (int32_t)GAL_BLANK_INT32)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, fmt, (int32_t)GAL_BLANK_INT32)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_UINT64:
       fmt = width ? "%*"PRIu64 : "%"PRIu64;
-      if(width) asprintf(&blank, fmt, width, (uint64_t)GAL_BLANK_UINT64);
-      else      asprintf(&blank, fmt,        (uint64_t)GAL_BLANK_UINT64);
+      if(width)
+        {
+          if( asprintf(&blank, fmt, width, (uint64_t)GAL_BLANK_UINT64)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, fmt, (uint64_t)GAL_BLANK_UINT64)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_INT64:
       fmt = width ? "%*"PRId64 : "%"PRId64;
-      if(width) asprintf(&blank, fmt, width, (int64_t)GAL_BLANK_INT64);
-      else      asprintf(&blank, fmt,        (int64_t)GAL_BLANK_INT64);
+      if(width)
+        {
+          if( asprintf(&blank, fmt, width, (int64_t)GAL_BLANK_INT64)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, fmt, (int64_t)GAL_BLANK_INT64)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_FLOAT32:
-      if(width) asprintf(&blank, "%*f", width,  (float)GAL_BLANK_FLOAT32);
-      else      asprintf(&blank, "%f",          (float)GAL_BLANK_FLOAT32);
+      if(width)
+        {
+          if( asprintf(&blank, "%*f", width,  (float)GAL_BLANK_FLOAT32)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, "%f", (float)GAL_BLANK_FLOAT32)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     case GAL_TYPE_FLOAT64:
-      if(width) asprintf(&blank, "%*f", width,  (double)GAL_BLANK_FLOAT64);
-      else      asprintf(&blank, "%f",          (double)GAL_BLANK_FLOAT64);
+      if(width)
+        {
+          if( asprintf(&blank, "%*f", width,  (double)GAL_BLANK_FLOAT64)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
+      else
+        {
+          if( asprintf(&blank, "%f", (double)GAL_BLANK_FLOAT64)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+        }
       break;
 
     default:
diff --git a/lib/box.c b/lib/box.c
index 07080b2..d42c37c 100644
--- a/lib/box.c
+++ b/lib/box.c
@@ -3,9 +3,9 @@ Box -- Define bounding and overlapping boxes.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/checkset.c b/lib/checkset.c
index 1d410b3..af5d01c 100644
--- a/lib/checkset.c
+++ b/lib/checkset.c
@@ -3,9 +3,9 @@ Functions to check and set command line argument values and 
files.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -146,7 +146,10 @@ gal_checkset_dataset_name(char *filename, char *hdu)
 {
   char *out;
   if( gal_fits_name_is_fits(filename) )
-    asprintf(&out, "%s (hdu %s)", filename, hdu);
+    {
+      if( asprintf(&out, "%s (hdu %s)", filename, hdu)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
   else
     gal_checkset_allocate_copy(filename, &out);
   return out;
diff --git a/lib/convolve.c b/lib/convolve.c
index 48287ff..0df670c 100644
--- a/lib/convolve.c
+++ b/lib/convolve.c
@@ -3,9 +3,9 @@ Convolve -- Convolve a dataset with a given kernel.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/cosmology.c b/lib/cosmology.c
index 15532cf..c4d8b1e 100644
--- a/lib/cosmology.c
+++ b/lib/cosmology.c
@@ -3,9 +3,9 @@ Cosmological calculations.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/data.c b/lib/data.c
index b7c5c8a..d3e85e1 100644
--- a/lib/data.c
+++ b/lib/data.c
@@ -3,9 +3,9 @@ data -- Structure and functions to represent/work with data
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -678,7 +678,11 @@ data_copy_from_string(gal_data_t *from, gal_data_t *to)
     CTYPE *a=from->array;                                               \
     for(i=0;i<from->size;++i)                                           \
       {                                                                 \
-        if(a[i]!=BLANK) asprintf(&strarr[i], FMT, a[i]);                \
+        if(a[i]!=BLANK)                                                 \
+          {                                                             \
+            if( asprintf(&strarr[i], FMT, a[i])<0 )                     \
+              error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__); \
+          }                                                             \
         else                                                            \
           gal_checkset_allocate_copy(GAL_BLANK_STRING, &strarr[i]);     \
       }                                                                 \
@@ -690,7 +694,11 @@ data_copy_from_string(gal_data_t *from, gal_data_t *to)
       {                                                                 \
         if(isnan(BLANK)) isblank = isnan(a[i]) ? 1 : 0;                 \
         else             isblank = a[i]==BLANK ? 1 : 0;                 \
-        if(isblank==0) asprintf(&strarr[i], "%f", a[i]);                \
+        if(isblank==0)                                                  \
+          {                                                             \
+            if( asprintf(&strarr[i], "%f", a[i])<0 )                    \
+              error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__); \
+          }                                                             \
         else gal_checkset_allocate_copy(GAL_BLANK_STRING, &strarr[i]);  \
       }                                                                 \
   }
diff --git a/lib/dimension.c b/lib/dimension.c
index 2600ee3..00f568e 100644
--- a/lib/dimension.c
+++ b/lib/dimension.c
@@ -3,9 +3,9 @@ dimension -- Functions for multi-dimensional operations.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/fits.c b/lib/fits.c
index 0bb4672..939d816 100644
--- a/lib/fits.c
+++ b/lib/fits.c
@@ -3,9 +3,9 @@ Functions to work with FITS image data.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -147,7 +147,10 @@ gal_fits_name_save_as_string(char *filename, char *hdu)
 {
   char *name;
   if( gal_fits_name_is_fits(filename) )
-    asprintf(&name, "%s (hdu: %s)", filename, hdu);
+    {
+      if( asprintf(&name, "%s (hdu: %s)", filename, hdu)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+    }
   else gal_checkset_allocate_copy(filename, &name);
   return name;
 }
@@ -671,7 +674,8 @@ gal_fits_hdu_open(char *filename, char *hdu, int iomode)
   fitsfile *fptr;
 
   /* Add hdu to filename: */
-  asprintf(&ffname, "%s[%s#]", filename, hdu);
+  if( asprintf(&ffname, "%s[%s#]", filename, hdu)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
 
   /* Open the FITS file: */
   if( fits_open_file(&fptr, ffname, iomode, &status) )
@@ -2494,8 +2498,10 @@ fits_table_prepare_arrays(gal_data_t *cols, size_t 
numcols, int tableformat,
   for(col=cols; col!=NULL; col=col->next)
     {
       /* Set the `ttype' and `tunit' values: */
-      asprintf(&ttype[i], "%s", col->name ? col->name : "");
-      asprintf(&tunit[i], "%s", col->unit ? col->unit : "");
+      if( asprintf(&ttype[i], "%s", col->name ? col->name : "")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+      if( asprintf(&tunit[i], "%s", col->unit ? col->unit : "")<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
 
 
       /* FITS's TFORM depends on the type of FITS table, so work
@@ -2537,13 +2543,15 @@ fits_table_prepare_arrays(gal_data_t *cols, size_t 
numcols, int tableformat,
               case GAL_TYPE_INT32:
               case GAL_TYPE_UINT64:
               case GAL_TYPE_INT64:
-                asprintf(&tform[i], "%c%d", fmt[0], col->disp_width);
+                if( asprintf(&tform[i], "%c%d", fmt[0], col->disp_width)<0 )
+                  error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
                 break;
 
               case GAL_TYPE_FLOAT32:
               case GAL_TYPE_FLOAT64:
-                asprintf(&tform[i], "%c%d.%d", fmt[0], col->disp_width,
-                         col->disp_precision);
+                if( asprintf(&tform[i], "%c%d.%d", fmt[0], col->disp_width,
+                             col->disp_precision)<0 )
+                  error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
                 break;
 
               default:
@@ -2561,9 +2569,15 @@ fits_table_prepare_arrays(gal_data_t *cols, size_t 
numcols, int tableformat,
           col->disp_width=fits_string_fixed_alloc_size(col);
           fmt[0]=gal_fits_type_to_bin_tform(col->type);
           if( col->type==GAL_TYPE_STRING )
-            asprintf(&tform[i], "%d%c", col->disp_width, fmt[0]);
+            {
+              if( asprintf(&tform[i], "%d%c", col->disp_width, fmt[0])<0 )
+                error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+            }
           else
-            asprintf(&tform[i], "%c", fmt[0]);
+            {
+              if( asprintf(&tform[i], "%c", fmt[0])<0 )
+                error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+            }
           break;
 
         default:
@@ -2599,7 +2613,8 @@ fits_write_tnull_tcomm(fitsfile *fptr, gal_data_t *col, 
int tableformat,
     case GAL_TABLE_FORMAT_AFITS:
 
       /* Print the keyword and value. */
-      asprintf(&keyname, "TNULL%zu", colnum);
+      if( asprintf(&keyname, "TNULL%zu", colnum)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       blank=gal_blank_as_string(col->type, col->disp_width);
 
       /* When in exponential form (`tform' starting with `E'), CFITSIO
@@ -2627,7 +2642,8 @@ fits_write_tnull_tcomm(fitsfile *fptr, gal_data_t *col, 
int tableformat,
           && col->type!=GAL_TYPE_STRING )
         {
           blank=gal_blank_alloc_write(col->type);
-          asprintf(&keyname, "TNULL%zu", colnum);
+          if( asprintf(&keyname, "TNULL%zu", colnum)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           fits_write_key(fptr, gal_fits_type_to_datatype(col->type),
                          keyname, blank, "blank value for this column",
                          &status);
@@ -2645,8 +2661,10 @@ fits_write_tnull_tcomm(fitsfile *fptr, gal_data_t *col, 
int tableformat,
   /* Write the comments if there is any. */
   if(col->comment)
     {
-      asprintf(&keyname, "TCOMM%zu", colnum);
-      asprintf(&bcomment, "comment for field %zu", colnum);
+      if( asprintf(&keyname, "TCOMM%zu", colnum)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+      if( asprintf(&bcomment, "comment for field %zu", colnum)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       fits_write_key(fptr, TSTRING, keyname, col->comment,
                      bcomment, &status);
       gal_fits_io_error(status, NULL);
diff --git a/lib/git.c b/lib/git.c
index 2661863..e63a981 100644
--- a/lib/git.c
+++ b/lib/git.c
@@ -3,9 +3,9 @@ Functions to deal with Git version controlled directories.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-and.h 
b/lib/gnuastro-internal/arithmetic-and.h
index 4632a16..c17df8f 100644
--- a/lib/gnuastro-internal/arithmetic-and.h
+++ b/lib/gnuastro-internal/arithmetic-and.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-binary.h 
b/lib/gnuastro-internal/arithmetic-binary.h
index b1b79c3..e8e35b5 100644
--- a/lib/gnuastro-internal/arithmetic-binary.h
+++ b/lib/gnuastro-internal/arithmetic-binary.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-bitand.h 
b/lib/gnuastro-internal/arithmetic-bitand.h
index bb221a0..1dcbf6f 100644
--- a/lib/gnuastro-internal/arithmetic-bitand.h
+++ b/lib/gnuastro-internal/arithmetic-bitand.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-bitlsh.h 
b/lib/gnuastro-internal/arithmetic-bitlsh.h
index 8311124..da8278b 100644
--- a/lib/gnuastro-internal/arithmetic-bitlsh.h
+++ b/lib/gnuastro-internal/arithmetic-bitlsh.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-bitor.h 
b/lib/gnuastro-internal/arithmetic-bitor.h
index 5cd2cb5..f4cf58b 100644
--- a/lib/gnuastro-internal/arithmetic-bitor.h
+++ b/lib/gnuastro-internal/arithmetic-bitor.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-bitrsh.h 
b/lib/gnuastro-internal/arithmetic-bitrsh.h
index bbe8695..d9139e8 100644
--- a/lib/gnuastro-internal/arithmetic-bitrsh.h
+++ b/lib/gnuastro-internal/arithmetic-bitrsh.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-bitxor.h 
b/lib/gnuastro-internal/arithmetic-bitxor.h
index a94eede..c788e7b 100644
--- a/lib/gnuastro-internal/arithmetic-bitxor.h
+++ b/lib/gnuastro-internal/arithmetic-bitxor.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-divide.h 
b/lib/gnuastro-internal/arithmetic-divide.h
index fb93428..af2e6a9 100644
--- a/lib/gnuastro-internal/arithmetic-divide.h
+++ b/lib/gnuastro-internal/arithmetic-divide.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-eq.h 
b/lib/gnuastro-internal/arithmetic-eq.h
index a5947bf..6852819 100644
--- a/lib/gnuastro-internal/arithmetic-eq.h
+++ b/lib/gnuastro-internal/arithmetic-eq.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-ge.h 
b/lib/gnuastro-internal/arithmetic-ge.h
index f1346f7..bab3a09 100644
--- a/lib/gnuastro-internal/arithmetic-ge.h
+++ b/lib/gnuastro-internal/arithmetic-ge.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-gt.h 
b/lib/gnuastro-internal/arithmetic-gt.h
index 5b2c9e8..e5f7bc0 100644
--- a/lib/gnuastro-internal/arithmetic-gt.h
+++ b/lib/gnuastro-internal/arithmetic-gt.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-internal.h 
b/lib/gnuastro-internal/arithmetic-internal.h
index d9cd846..59a5528 100644
--- a/lib/gnuastro-internal/arithmetic-internal.h
+++ b/lib/gnuastro-internal/arithmetic-internal.h
@@ -3,9 +3,9 @@ Arithmetic -- Preform arithmetic operations on datasets.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-le.h 
b/lib/gnuastro-internal/arithmetic-le.h
index b45866e..b67c205 100644
--- a/lib/gnuastro-internal/arithmetic-le.h
+++ b/lib/gnuastro-internal/arithmetic-le.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-lt.h 
b/lib/gnuastro-internal/arithmetic-lt.h
index 40fe879..ebc3872 100644
--- a/lib/gnuastro-internal/arithmetic-lt.h
+++ b/lib/gnuastro-internal/arithmetic-lt.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-minus.h 
b/lib/gnuastro-internal/arithmetic-minus.h
index 5a977b0..8d5b70c 100644
--- a/lib/gnuastro-internal/arithmetic-minus.h
+++ b/lib/gnuastro-internal/arithmetic-minus.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-modulo.h 
b/lib/gnuastro-internal/arithmetic-modulo.h
index 2671d5f..6e6ca80 100644
--- a/lib/gnuastro-internal/arithmetic-modulo.h
+++ b/lib/gnuastro-internal/arithmetic-modulo.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-multiply.h 
b/lib/gnuastro-internal/arithmetic-multiply.h
index b951006..a4396c8 100644
--- a/lib/gnuastro-internal/arithmetic-multiply.h
+++ b/lib/gnuastro-internal/arithmetic-multiply.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-ne.h 
b/lib/gnuastro-internal/arithmetic-ne.h
index e54b9c0..25a1469 100644
--- a/lib/gnuastro-internal/arithmetic-ne.h
+++ b/lib/gnuastro-internal/arithmetic-ne.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-or.h 
b/lib/gnuastro-internal/arithmetic-or.h
index e2763f6..772f3b6 100644
--- a/lib/gnuastro-internal/arithmetic-or.h
+++ b/lib/gnuastro-internal/arithmetic-or.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/arithmetic-plus.h 
b/lib/gnuastro-internal/arithmetic-plus.h
index cf6ddcc..cddfe9c 100644
--- a/lib/gnuastro-internal/arithmetic-plus.h
+++ b/lib/gnuastro-internal/arithmetic-plus.h
@@ -3,9 +3,9 @@ Arithmetic operations on data structures.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/checkset.h b/lib/gnuastro-internal/checkset.h
index 51050bb..ee6314a 100644
--- a/lib/gnuastro-internal/checkset.h
+++ b/lib/gnuastro-internal/checkset.h
@@ -3,9 +3,9 @@ Functions to check and set command line argument values and 
files.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/commonopts.h 
b/lib/gnuastro-internal/commonopts.h
index 735ac5c..06421e4 100644
--- a/lib/gnuastro-internal/commonopts.h
+++ b/lib/gnuastro-internal/commonopts.h
@@ -4,9 +4,9 @@ Common parameters between all programs.
 IMPORTANT: This header must only be included the programs, not libraries.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/config.h.in 
b/lib/gnuastro-internal/config.h.in
index b40ad23..47a3b96 100644
--- a/lib/gnuastro-internal/config.h.in
+++ b/lib/gnuastro-internal/config.h.in
@@ -2,9 +2,9 @@
 Functions dealing with general aspects of all Gnuastro.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/fixedstringmacros.h 
b/lib/gnuastro-internal/fixedstringmacros.h
index 4d7d685..479651e 100644
--- a/lib/gnuastro-internal/fixedstringmacros.h
+++ b/lib/gnuastro-internal/fixedstringmacros.h
@@ -3,9 +3,9 @@ Fixed strings for use in all utilities.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -26,7 +26,7 @@ along with Gnuastro. If not, see 
<http://www.gnu.org/licenses/>.
 
 
 #define GAL_STRINGS_SHORT_COPYRIGHT                                     \
-  "Copyright (C) 2015-2017, Free Software Foundation, Inc."
+  "Copyright (C) 2015-2018, Free Software Foundation, Inc."
 
 
 #define GAL_STRINGS_SHORT_LICENSE                                       \
diff --git a/lib/gnuastro-internal/options.h b/lib/gnuastro-internal/options.h
index b14c739..a3f8ea3 100644
--- a/lib/gnuastro-internal/options.h
+++ b/lib/gnuastro-internal/options.h
@@ -2,9 +2,9 @@
 Function to parse options and configuration file values.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/tableintern.h 
b/lib/gnuastro-internal/tableintern.h
index 5f21b2c..7ade57d 100644
--- a/lib/gnuastro-internal/tableintern.h
+++ b/lib/gnuastro-internal/tableintern.h
@@ -3,9 +3,9 @@ tableintern -- Internalfunctions for table input and output.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro-internal/timing.h b/lib/gnuastro-internal/timing.h
index c29f827..d43d76a 100644
--- a/lib/gnuastro-internal/timing.h
+++ b/lib/gnuastro-internal/timing.h
@@ -3,9 +3,9 @@ Functions to report timing in verbose mode.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/arithmetic.h b/lib/gnuastro/arithmetic.h
index f5a2b8a..2e8e058 100644
--- a/lib/gnuastro/arithmetic.h
+++ b/lib/gnuastro/arithmetic.h
@@ -3,9 +3,9 @@ Arithmetic -- Preform arithmetic operations on datasets.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/binary.h b/lib/gnuastro/binary.h
index 1f25915..bac8b7c 100644
--- a/lib/gnuastro/binary.h
+++ b/lib/gnuastro/binary.h
@@ -3,9 +3,9 @@ binary -- Work on binary (0 and 1 valued) datasets.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/blank.h b/lib/gnuastro/blank.h
index 09129de..674496f 100644
--- a/lib/gnuastro/blank.h
+++ b/lib/gnuastro/blank.h
@@ -3,9 +3,9 @@ blank -- Deal with blank values in a datasets
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/box.h b/lib/gnuastro/box.h
index 72f48a6..4e7fbbe 100644
--- a/lib/gnuastro/box.h
+++ b/lib/gnuastro/box.h
@@ -3,9 +3,9 @@ Box -- Define bounding and overlapping boxes.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/convolve.h b/lib/gnuastro/convolve.h
index 07ba554..addf8b8 100644
--- a/lib/gnuastro/convolve.h
+++ b/lib/gnuastro/convolve.h
@@ -3,9 +3,9 @@ Convolve -- Convolve the dataset with a given kernel.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/cosmology.h b/lib/gnuastro/cosmology.h
index 44d5d52..377dd19 100644
--- a/lib/gnuastro/cosmology.h
+++ b/lib/gnuastro/cosmology.h
@@ -3,9 +3,9 @@ Cosmological calculations.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/data.h b/lib/gnuastro/data.h
index 5d30f1d..c6332de 100644
--- a/lib/gnuastro/data.h
+++ b/lib/gnuastro/data.h
@@ -3,9 +3,9 @@ data -- Structure and functions to represent/work with data
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/dimension.h b/lib/gnuastro/dimension.h
index 4d81db0..2cb434b 100644
--- a/lib/gnuastro/dimension.h
+++ b/lib/gnuastro/dimension.h
@@ -3,9 +3,9 @@ multidim -- Functions for multi-dimensional operations.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/fits.h b/lib/gnuastro/fits.h
index 86d7343..058ef12 100644
--- a/lib/gnuastro/fits.h
+++ b/lib/gnuastro/fits.h
@@ -3,9 +3,9 @@ Functions to convert a FITS array to a C array and vice versa.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/git.h b/lib/gnuastro/git.h
index 84651bf..4f8f334 100644
--- a/lib/gnuastro/git.h
+++ b/lib/gnuastro/git.h
@@ -3,9 +3,9 @@ Functions to facilitate using the Git library.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/interpolate.h b/lib/gnuastro/interpolate.h
index 2c878fb..0a5438d 100644
--- a/lib/gnuastro/interpolate.h
+++ b/lib/gnuastro/interpolate.h
@@ -3,9 +3,9 @@ tile -- work with tesselations over a host dataset.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/list.h b/lib/gnuastro/list.h
index c9a882a..492e189 100644
--- a/lib/gnuastro/list.h
+++ b/lib/gnuastro/list.h
@@ -3,9 +3,9 @@ Functions for linked lists.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/match.h b/lib/gnuastro/match.h
index 5e05baf..a876bec 100644
--- a/lib/gnuastro/match.h
+++ b/lib/gnuastro/match.h
@@ -3,9 +3,9 @@ match -- Functions to match catalogs and WCS.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/permutation.h b/lib/gnuastro/permutation.h
index 905855d..c1ad46e 100644
--- a/lib/gnuastro/permutation.h
+++ b/lib/gnuastro/permutation.h
@@ -3,9 +3,9 @@ Permutation -- Work on permutations (arrays of indexs).
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/polygon.h b/lib/gnuastro/polygon.h
index 2325eee..b3f3ff8 100644
--- a/lib/gnuastro/polygon.h
+++ b/lib/gnuastro/polygon.h
@@ -3,9 +3,9 @@ Polygon related functions and macros.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/qsort.h b/lib/gnuastro/qsort.h
index 0cb532d..5daa693 100644
--- a/lib/gnuastro/qsort.h
+++ b/lib/gnuastro/qsort.h
@@ -3,9 +3,9 @@ forqsort -- Functions used by qsort to sort an array.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/statistics.h b/lib/gnuastro/statistics.h
index eba914d..510d905 100644
--- a/lib/gnuastro/statistics.h
+++ b/lib/gnuastro/statistics.h
@@ -3,9 +3,9 @@ Statistical functions.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/table.h b/lib/gnuastro/table.h
index aea96c9..69ace6f 100644
--- a/lib/gnuastro/table.h
+++ b/lib/gnuastro/table.h
@@ -3,9 +3,9 @@ table -- functions for table input and output.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/threads.h b/lib/gnuastro/threads.h
index 5a33501..75daac0 100644
--- a/lib/gnuastro/threads.h
+++ b/lib/gnuastro/threads.h
@@ -3,9 +3,9 @@ Functions to facilitate using threads.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/tile.h b/lib/gnuastro/tile.h
index 02ae328..6397268 100644
--- a/lib/gnuastro/tile.h
+++ b/lib/gnuastro/tile.h
@@ -3,9 +3,9 @@ tile -- work with tesselations over a host dataset.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/txt.h b/lib/gnuastro/txt.h
index 56816e5..d6ec0be 100644
--- a/lib/gnuastro/txt.h
+++ b/lib/gnuastro/txt.h
@@ -3,9 +3,9 @@ txt -- functions to deal with plain text files.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/type.h b/lib/gnuastro/type.h
index 6f0090b..975ce17 100644
--- a/lib/gnuastro/type.h
+++ b/lib/gnuastro/type.h
@@ -3,9 +3,9 @@ Type -- Type information and basic operations.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/gnuastro/wcs.h b/lib/gnuastro/wcs.h
index 553b8ae..72be5a0 100644
--- a/lib/gnuastro/wcs.h
+++ b/lib/gnuastro/wcs.h
@@ -3,9 +3,9 @@ Functions to that only use WCSLIB's functions, not related to 
FITS.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/interpolate.c b/lib/interpolate.c
index 087e84c..1276aaa 100644
--- a/lib/interpolate.c
+++ b/lib/interpolate.c
@@ -3,9 +3,9 @@ Interpolate - Fill blank values in a dataset
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/list.c b/lib/list.c
index 3a1d85b..b84e1c9 100644
--- a/lib/list.c
+++ b/lib/list.c
@@ -3,9 +3,9 @@ Functions for linked lists.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/match.c b/lib/match.c
index 3bd120d..f156339 100644
--- a/lib/match.c
+++ b/lib/match.c
@@ -3,9 +3,9 @@ match -- Functions to match catalogs and WCS.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/options.c b/lib/options.c
index 6e4d8f8..8b2f89e 100644
--- a/lib/options.c
+++ b/lib/options.c
@@ -2,9 +2,9 @@
 Function to parse options and configuration file values.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -266,15 +266,17 @@ gal_options_print_citation(struct argp_option *option, 
char *arg,
 
 
   /* Notice for acknowledgements. */
-  asprintf(&gnuastro_acknowledgement,
-           "Acknowledgement\n"
-           "---------------\n"
-           "This work was partly done using GNU Astronomy Utilities "
-           "(Gnuastro) version %s. Gnuastro is a generic package for "
-           "astronomical data manipulation and analysis which was "
-           "initially created and developed for research funded by the "
-           "Monbukagakusho (Japanese government) scholarship and ERC "
-           "advanced grant 339659-MUSICOS.", PACKAGE_VERSION);
+  if( asprintf(&gnuastro_acknowledgement,
+               "Acknowledgement\n"
+               "---------------\n"
+               "This work was partly done using GNU Astronomy Utilities "
+               "(Gnuastro, ascl.net/1801.009) version %s. Gnuastro is a "
+               "generic package for astronomical data manipulation and "
+               "analysis which was initially created and developed for "
+               "research funded by the Monbukagakusho (Japanese "
+               "government) scholarship and European Research Council "
+               "(ERC) advanced grant 339659-MUSICOS.", PACKAGE_VERSION)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   printf("%s\n", gnuastro_acknowledgement);
   free(gnuastro_acknowledgement);
 
@@ -876,7 +878,8 @@ gal_options_read_sigma_clip(struct argp_option *option, 
char *arg,
   /* Caller wants to print the option values. */
   if(lineno==-1)
     {
-      asprintf(&str, "%g,%g", sigmaclip[0], sigmaclip[1]);
+      if( asprintf(&str, "%g,%g", sigmaclip[0], sigmaclip[1])<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       return str;
     }
 
@@ -1622,12 +1625,14 @@ gal_options_parse_config_files(struct 
gal_options_common_params *cp)
           "`uint8' type", __func__, PACKAGE_BUGREPORT);
 
   /* The program's current directory configuration file. */
-  asprintf(&filename, ".%s/%s.conf", PACKAGE, cp->program_exec);
+  if( asprintf(&filename, ".%s/%s.conf", PACKAGE, cp->program_exec)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   options_parse_file(filename, cp, 0);
   free(filename);
 
   /* Common options configuration file. */
-  asprintf(&filename, ".%s/%s.conf", PACKAGE, PACKAGE);
+  if( asprintf(&filename, ".%s/%s.conf", PACKAGE, PACKAGE)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   options_parse_file(filename, cp, 0);
   free(filename);
 
@@ -1635,23 +1640,27 @@ gal_options_parse_config_files(struct 
gal_options_common_params *cp)
   home=options_get_home();
 
   /* The program's user-wide configuration file. */
-  asprintf(&filename, "%s/%s/%s.conf", home, USERCONFIG_DIR,
-           cp->program_exec);
+  if( asprintf(&filename, "%s/%s/%s.conf", home, USERCONFIG_DIR,
+               cp->program_exec)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   options_parse_file(filename, cp, 0);
   free(filename);
 
   /* Common options user-wide configuration file. */
-  asprintf(&filename, "%s/%s/%s.conf", home, USERCONFIG_DIR, PACKAGE);
+  if( asprintf(&filename, "%s/%s/%s.conf", home, USERCONFIG_DIR, PACKAGE)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   options_parse_file(filename, cp, 0);
   free(filename);
 
   /* The program's system-wide configuration file. */
-  asprintf(&filename, "%s/%s.conf", SYSCONFIG_DIR, cp->program_exec);
+  if( asprintf(&filename, "%s/%s.conf", SYSCONFIG_DIR, cp->program_exec)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   options_parse_file(filename, cp, 0);
   free(filename);
 
   /* Common options system-wide configuration file. */
-  asprintf(&filename, "%s/%s.conf", SYSCONFIG_DIR, PACKAGE);
+  if( asprintf(&filename, "%s/%s.conf", SYSCONFIG_DIR, PACKAGE)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   options_parse_file(filename, cp, 0);
   free(filename);
 }
@@ -1990,7 +1999,8 @@ options_print_all(struct gal_options_common_params *cp, 
char *dirname,
       gal_checkset_mkdir(dirname);
 
       /* Prepare the full filename: */
-      asprintf(&filename, "%s/%s.conf", dirname, cp->program_exec);
+      if( asprintf(&filename, "%s/%s.conf", dirname, cp->program_exec)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
 
       /* Remove the file if it already exists. */
       gal_checkset_writable_remove(filename, 0, 0);
@@ -2127,14 +2137,16 @@ gal_options_print_state(struct 
gal_options_common_params *cp)
           break;
 
         case GAL_OPTIONS_KEY_SETDIRCONF:
-          asprintf(&dirname, ".%s", PACKAGE);
+          if( asprintf(&dirname, ".%s", PACKAGE)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           options_print_all(cp, dirname, cp->coptions[i].name);
           free(dirname);
           break;
 
         case GAL_OPTIONS_KEY_SETUSRCONF:
           home=options_get_home();
-          asprintf(&dirname, "%s/%s", home, USERCONFIG_DIR);
+          if( asprintf(&dirname, "%s/%s", home, USERCONFIG_DIR)<0 )
+            error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
           options_print_all(cp, dirname, cp->coptions[i].name);
           free(dirname);
           break;
diff --git a/lib/permutation.c b/lib/permutation.c
index 1401928..3885e65 100644
--- a/lib/permutation.c
+++ b/lib/permutation.c
@@ -3,9 +3,9 @@ Permutation -- Work on permutations (arrays of indexs).
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/polygon.c b/lib/polygon.c
index bb3c709..1bd4bfa 100644
--- a/lib/polygon.c
+++ b/lib/polygon.c
@@ -3,9 +3,9 @@ Polygon related functions and macros.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/qsort.c b/lib/qsort.c
index b06981a..6e6cd70 100644
--- a/lib/qsort.c
+++ b/lib/qsort.c
@@ -3,9 +3,9 @@ forqsort -- Functions used by qsort to sort an array.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/statistics.c b/lib/statistics.c
index a85ce88..4ff9b79 100644
--- a/lib/statistics.c
+++ b/lib/statistics.c
@@ -3,9 +3,9 @@ Statistical functions.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/table.c b/lib/table.c
index c917669..a263700 100644
--- a/lib/table.c
+++ b/lib/table.c
@@ -3,9 +3,9 @@ table -- Functions for I/O on tables.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -358,8 +358,10 @@ make_list_of_indexs(gal_list_str_t *cols, gal_data_t 
*allcols,
            are done (and program is aborted) before this step. */
         if(nummatch==0)
           {
-            asprintf(&errorstring, "`%s' didn't match any of the column %ss.",
-                     tmp->v, gal_tableintern_searchin_as_string(searchin));
+            if( asprintf(&errorstring, "`%s' didn't match any of the "
+                         "column %ss.", tmp->v,
+                         gal_tableintern_searchin_as_string(searchin))<0 )
+              error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
             gal_tableintern_error_col_selection(filename, hdu, errorstring);
           }
 
@@ -500,7 +502,8 @@ gal_table_comments_add_intro(gal_list_str_t **comments, 
char *program_string,
      line. Note that ctime puts a `\n' at the end of its string, so we'll
      have to remove that. Also, note that since we are allocating `msg', we
      are setting the allocate flag of `gal_list_str_add' to 0. */
-  asprintf(&tmp, "Created%s on %s", gitdescribe, ctime(rawtime));
+  if( asprintf(&tmp, "Created%s on %s", gitdescribe, ctime(rawtime))<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   tmp[ strlen(tmp)-1 ]='\0';
   gal_list_str_add(comments, tmp, 0);
 
@@ -558,7 +561,8 @@ gal_table_write_log(gal_data_t *logll, char *program_string,
   /* In verbose mode, print the information. */
   if(!quiet)
     {
-      asprintf(&msg, "%s created.", filename);
+      if( asprintf(&msg, "%s created.", filename)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       gal_timing_report(NULL, msg, 1);
       free(msg);
     }
diff --git a/lib/tableintern.c b/lib/tableintern.c
index a090abd..b6e0bdb 100644
--- a/lib/tableintern.c
+++ b/lib/tableintern.c
@@ -3,9 +3,9 @@ table -- Functions for I/O on tables.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -54,10 +54,12 @@ gal_tableintern_error_col_selection(char *filename, char 
*hdu,
   /* Set the proper pointers. */
   if(gal_fits_name_is_fits(filename))
     {
-      asprintf(&name, "%s (hdu: %s)", filename, hdu);
+      if( asprintf(&name, "%s (hdu: %s)", filename, hdu)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       c=hdu; while(*c!='\0') if(isspace(*c++)) break;
-      asprintf(&command, *c=='\0' ? "%s --hdu=%s" : "%s --hdu=\"%s\"",
-               filename, hdu);
+      if( asprintf(&command, *c=='\0' ? "%s --hdu=%s" : "%s --hdu=\"%s\"",
+                   filename, hdu)<0 )
+        error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
     }
   else command=name=filename;
 
diff --git a/lib/threads.c b/lib/threads.c
index d6c8a77..433ce33 100644
--- a/lib/threads.c
+++ b/lib/threads.c
@@ -3,9 +3,9 @@ Functions to facilitate using threads.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/tile.c b/lib/tile.c
index c972ea5..b46c002 100644
--- a/lib/tile.c
+++ b/lib/tile.c
@@ -3,9 +3,9 @@ tile -- work with tesselations over a host dataset.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/timing.c b/lib/timing.c
index 54f8a1d..cdb88fb 100644
--- a/lib/timing.c
+++ b/lib/timing.c
@@ -3,9 +3,9 @@ Functions to report timing in verbose mode.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/lib/txt.c b/lib/txt.c
index 5dd87a3..f329232 100644
--- a/lib/txt.c
+++ b/lib/txt.c
@@ -3,9 +3,9 @@ txt -- functions to deal with plain text files.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -1206,7 +1206,8 @@ txt_open_file_write_info(gal_data_t *datall, char **fmts,
      over-write the one that `sprintf' puts with a `:' for the columns
      that have the same number of digits as the final column. */
   i=0;
-  asprintf(&nstr, "%zu:", num);
+  if( asprintf(&nstr, "%zu:", num)<0 )
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   nlen=strlen(nstr);
   for(data=datall; data!=NULL; data=data->next)
     {
diff --git a/lib/type.c b/lib/type.c
index 197fffd..f59981d 100644
--- a/lib/type.c
+++ b/lib/type.c
@@ -3,9 +3,9 @@ Type -- Type information and basic operations.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2016, Free Software Foundation, Inc.
+Copyright (C) 2016-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -362,7 +362,10 @@ gal_type_bit_string(void *in, size_t size)
 
 /* Write the contents of memory that `ptr' points to as a string of type
    `type'.*/
-#define TO_STRING(CTYPE, FMT) asprintf(&str, FMT, *(CTYPE *)ptr);
+#define TO_STRING(CTYPE, FMT) {                                         \
+  if( asprintf(&str, FMT, *(CTYPE *)ptr)<0 )                            \
+    error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__); }
+
 char *
 gal_type_to_string(void *ptr, uint8_t type, int quote_if_str_has_space)
 {
@@ -376,11 +379,20 @@ gal_type_to_string(void *ptr, uint8_t type, int 
quote_if_str_has_space)
       if(quote_if_str_has_space)
         {
           c=*(char **)ptr; while(*c!='\0') if(isspace(*c++)) break;
-          if(*c=='\0') asprintf(&str, "%s",      *(char **)ptr);
-          else         asprintf(&str, "\"%s\" ", *(char **)ptr);
+          if(*c=='\0')
+            {
+              if( asprintf(&str, "%s", *(char **)ptr)<0 )
+                error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+            }
+          else
+            {
+              if( asprintf(&str, "\"%s\" ", *(char **)ptr)<0 )
+                error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
+            }
         }
       else
-        asprintf(&str, "%s", *(char **)ptr);
+        if( asprintf(&str, "%s", *(char **)ptr)<0 )
+          error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
       break;
 
     case GAL_TYPE_UINT8:   TO_STRING( uint8_t,  "%"PRIu8  );  break;
diff --git a/lib/wcs.c b/lib/wcs.c
index c3721bf..ededd0d 100644
--- a/lib/wcs.c
+++ b/lib/wcs.c
@@ -3,9 +3,9 @@ Functions to that only use WCSLIB functionality.
 This is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6898cfc..6e17151 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.inx
 ##
 ## Original author:
-##     Mohammad Akhlaghi <akhlaghi@gnu.org>
+##     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 ## Contributing author(s):
-## Copyright (C) 2015, Free Software Foundation, Inc.
+## Copyright (C) 2015-2018, Free Software Foundation, Inc.
 ##
 ## Gnuastro is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
@@ -199,6 +199,7 @@ AM_CPPFLAGS = -I../lib
 AM_TESTS_ENVIRONMENT =                              \
 export mkdir_p="$(MKDIR_P)";                        \
 export topsrc=$(top_srcdir);                        \
+export topbuild=$(top_builddir);                    \
 export haslibjpeg=$(MAYBE_HASLIBJPEG);              \
 export hasgnulibtool=$(MAYBE_HASGNULIBTOOL);        \
 export hasghostscript=$(MAYBE_HASGHOSTSCRIPT);
diff --git a/tests/arithmetic/onlynumbers.sh b/tests/arithmetic/onlynumbers.sh
index 785e76a..2a99de9 100755
--- a/tests/arithmetic/onlynumbers.sh
+++ b/tests/arithmetic/onlynumbers.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/arithmetic/or.sh b/tests/arithmetic/or.sh
index 263dcbf..81efa6f 100755
--- a/tests/arithmetic/or.sh
+++ b/tests/arithmetic/or.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/arithmetic/snimage.sh b/tests/arithmetic/snimage.sh
index c54e764..18f719a 100755
--- a/tests/arithmetic/snimage.sh
+++ b/tests/arithmetic/snimage.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/arithmetic/where.sh b/tests/arithmetic/where.sh
index c1c47f5..cb5acc1 100755
--- a/tests/arithmetic/where.sh
+++ b/tests/arithmetic/where.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/buildprog/simpleio.c b/tests/buildprog/simpleio.c
index 6be745e..7354ba7 100644
--- a/tests/buildprog/simpleio.c
+++ b/tests/buildprog/simpleio.c
@@ -2,9 +2,9 @@
 A test program to multithreaded building using Gnuastro's helpers.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/tests/buildprog/simpleio.sh b/tests/buildprog/simpleio.sh
index 499a56d..d76baa0 100755
--- a/tests/buildprog/simpleio.sh
+++ b/tests/buildprog/simpleio.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/convertt/blankch.sh b/tests/convertt/blankch.sh
index a496965..0cbf207 100755
--- a/tests/convertt/blankch.sh
+++ b/tests/convertt/blankch.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/convertt/fitstojpeg.sh b/tests/convertt/fitstojpeg.sh
index 5c4308c..1c17884 100755
--- a/tests/convertt/fitstojpeg.sh
+++ b/tests/convertt/fitstojpeg.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/convertt/fitstojpegcmyk.sh b/tests/convertt/fitstojpegcmyk.sh
index 03dc399..89c7d2a 100755
--- a/tests/convertt/fitstojpegcmyk.sh
+++ b/tests/convertt/fitstojpegcmyk.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/convertt/fitstopdf.sh b/tests/convertt/fitstopdf.sh
index aef1e6d..15bd654 100755
--- a/tests/convertt/fitstopdf.sh
+++ b/tests/convertt/fitstopdf.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/convertt/fitstotxt.sh b/tests/convertt/fitstotxt.sh
index 817777d..595a223 100755
--- a/tests/convertt/fitstotxt.sh
+++ b/tests/convertt/fitstotxt.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/convertt/jpegtofits.sh b/tests/convertt/jpegtofits.sh
index aefe14c..ea6c028 100755
--- a/tests/convertt/jpegtofits.sh
+++ b/tests/convertt/jpegtofits.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/convertt/jpegtotxt.sh b/tests/convertt/jpegtotxt.sh
index ec513fe..9cc8712 100755
--- a/tests/convertt/jpegtotxt.sh
+++ b/tests/convertt/jpegtotxt.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/convolve/frequency.sh b/tests/convolve/frequency.sh
index 23667f9..da84ec2 100755
--- a/tests/convolve/frequency.sh
+++ b/tests/convolve/frequency.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/convolve/spatial.sh b/tests/convolve/spatial.sh
index a646e13..344a870 100755
--- a/tests/convolve/spatial.sh
+++ b/tests/convolve/spatial.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/cosmiccal/simpletest.sh b/tests/cosmiccal/simpletest.sh
index 4b9f500..08bce79 100755
--- a/tests/cosmiccal/simpletest.sh
+++ b/tests/cosmiccal/simpletest.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/crop/imgcat.sh b/tests/crop/imgcat.sh
index 824db0d..9693a79 100755
--- a/tests/crop/imgcat.sh
+++ b/tests/crop/imgcat.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/crop/imgcenter.sh b/tests/crop/imgcenter.sh
index f56d149..03960ef 100755
--- a/tests/crop/imgcenter.sh
+++ b/tests/crop/imgcenter.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/crop/imgcenternoblank.sh b/tests/crop/imgcenternoblank.sh
index e23826b..cc52403 100755
--- a/tests/crop/imgcenternoblank.sh
+++ b/tests/crop/imgcenternoblank.sh
@@ -5,7 +5,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/crop/imgoutpolygon.sh b/tests/crop/imgoutpolygon.sh
index 3a0b532..d742644 100755
--- a/tests/crop/imgoutpolygon.sh
+++ b/tests/crop/imgoutpolygon.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/crop/imgpolygon.sh b/tests/crop/imgpolygon.sh
index 0c6b459..f3ae21b 100755
--- a/tests/crop/imgpolygon.sh
+++ b/tests/crop/imgpolygon.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/crop/section.sh b/tests/crop/section.sh
index efcc623..7d0704d 100755
--- a/tests/crop/section.sh
+++ b/tests/crop/section.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/crop/wcscat.sh b/tests/crop/wcscat.sh
index 48a1923..ac82a89 100755
--- a/tests/crop/wcscat.sh
+++ b/tests/crop/wcscat.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/crop/wcscenter.sh b/tests/crop/wcscenter.sh
index 5d62411..c174aad 100755
--- a/tests/crop/wcscenter.sh
+++ b/tests/crop/wcscenter.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/crop/wcspolygon.sh b/tests/crop/wcspolygon.sh
index 0e302fc..692a447 100755
--- a/tests/crop/wcspolygon.sh
+++ b/tests/crop/wcspolygon.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/during-dev.sh b/tests/during-dev.sh
index 18c9bf4..81cfaf7 100755
--- a/tests/during-dev.sh
+++ b/tests/during-dev.sh
@@ -39,9 +39,9 @@
 # this file.
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
-# Copyright (C) 2016, Free Software Foundation, Inc.
+# Copyright (C) 2016-2018, Free Software Foundation, Inc.
 #
 # Gnuastro is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
diff --git a/tests/fits/copyhdu.sh b/tests/fits/copyhdu.sh
index 453d831..95edc6f 100755
--- a/tests/fits/copyhdu.sh
+++ b/tests/fits/copyhdu.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/fits/delete.sh b/tests/fits/delete.sh
index 8ee2ece..554debb 100755
--- a/tests/fits/delete.sh
+++ b/tests/fits/delete.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/fits/print.sh b/tests/fits/print.sh
index 298fdd3..7ea8d8a 100755
--- a/tests/fits/print.sh
+++ b/tests/fits/print.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/fits/update.sh b/tests/fits/update.sh
index 4195379..c4419bc 100755
--- a/tests/fits/update.sh
+++ b/tests/fits/update.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/fits/write.sh b/tests/fits/write.sh
index dde0a2a..27e490a 100755
--- a/tests/fits/write.sh
+++ b/tests/fits/write.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/lib/multithread.c b/tests/lib/multithread.c
index eaa2945..65cd5a6 100644
--- a/tests/lib/multithread.c
+++ b/tests/lib/multithread.c
@@ -2,9 +2,9 @@
 A test program to multithreaded building using Gnuastro's helpers.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2017, Free Software Foundation, Inc.
+Copyright (C) 2017-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/tests/lib/multithread.sh b/tests/lib/multithread.sh
index d3a957f..4e60f05 100755
--- a/tests/lib/multithread.sh
+++ b/tests/lib/multithread.sh
@@ -5,7 +5,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/lib/versioncxx.cpp b/tests/lib/versioncxx.cpp
index d3cc313..0e62f3a 100644
--- a/tests/lib/versioncxx.cpp
+++ b/tests/lib/versioncxx.cpp
@@ -2,9 +2,9 @@
 A test program to get and use the version number of Gnuastro within C++.
 
 Original author:
-     Mohammad Akhlaghi <akhlaghi@gnu.org>
+     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2015-2018, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff --git a/tests/lib/versioncxx.sh b/tests/lib/versioncxx.sh
index 5438c14..51cf328 100755
--- a/tests/lib/versioncxx.sh
+++ b/tests/lib/versioncxx.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/match/merged-cols.sh b/tests/match/merged-cols.sh
index 2af07da..ea1e124 100755
--- a/tests/match/merged-cols.sh
+++ b/tests/match/merged-cols.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/match/positions.sh b/tests/match/positions.sh
index 4e69c1b..a620873 100755
--- a/tests/match/positions.sh
+++ b/tests/match/positions.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mkcatalog/aperturephot.sh b/tests/mkcatalog/aperturephot.sh
index 39c8bd7..196049b 100755
--- a/tests/mkcatalog/aperturephot.sh
+++ b/tests/mkcatalog/aperturephot.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mkcatalog/simple.sh b/tests/mkcatalog/simple.sh
index 31df649..71a3ebb 100755
--- a/tests/mkcatalog/simple.sh
+++ b/tests/mkcatalog/simple.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mknoise/addnoise.sh b/tests/mknoise/addnoise.sh
index 1cb9a9c..2720182 100755
--- a/tests/mknoise/addnoise.sh
+++ b/tests/mknoise/addnoise.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mkprof/clearcanvas.sh b/tests/mkprof/clearcanvas.sh
index fec50cb..99fb94e 100755
--- a/tests/mkprof/clearcanvas.sh
+++ b/tests/mkprof/clearcanvas.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mkprof/ellipticalmasks.sh b/tests/mkprof/ellipticalmasks.sh
index 5464f22..1423d7f 100755
--- a/tests/mkprof/ellipticalmasks.sh
+++ b/tests/mkprof/ellipticalmasks.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mkprof/mosaic1.sh b/tests/mkprof/mosaic1.sh
index 8cdc6f3..b968da7 100755
--- a/tests/mkprof/mosaic1.sh
+++ b/tests/mkprof/mosaic1.sh
@@ -9,7 +9,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mkprof/mosaic2.sh b/tests/mkprof/mosaic2.sh
index 8575bb7..c994bc3 100755
--- a/tests/mkprof/mosaic2.sh
+++ b/tests/mkprof/mosaic2.sh
@@ -11,7 +11,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mkprof/mosaic3.sh b/tests/mkprof/mosaic3.sh
index c513f92..a2fa97e 100755
--- a/tests/mkprof/mosaic3.sh
+++ b/tests/mkprof/mosaic3.sh
@@ -9,7 +9,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mkprof/mosaic4.sh b/tests/mkprof/mosaic4.sh
index 16120e8..0218a39 100755
--- a/tests/mkprof/mosaic4.sh
+++ b/tests/mkprof/mosaic4.sh
@@ -9,7 +9,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/mkprof/radeccat.sh b/tests/mkprof/radeccat.sh
index fdcf564..801369f 100755
--- a/tests/mkprof/radeccat.sh
+++ b/tests/mkprof/radeccat.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/noisechisel/noisechisel.sh b/tests/noisechisel/noisechisel.sh
index c60aebf..ef9ebdf 100755
--- a/tests/noisechisel/noisechisel.sh
+++ b/tests/noisechisel/noisechisel.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/prepconf.sh b/tests/prepconf.sh
index 984b96a..0035607 100755
--- a/tests/prepconf.sh
+++ b/tests/prepconf.sh
@@ -4,9 +4,9 @@
 # Utilities (Gnuastro).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
-# Copyright (C) 2016, Free Software Foundation, Inc.
+# Copyright (C) 2016-2018, Free Software Foundation, Inc.
 #
 # Gnuastro is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -64,17 +64,21 @@ rm addedoptions.txt
 
 
 
+
 # Bring utility configuration files
 # ---------------------------------
 #
 # Each utility's configuration file is copied in the `tests' directory for
-# easy readability. We are just using a wildcard to copy any configuration
-# file in each program's source. This is because some programs come with
-# some supplementary configuration files to help the users (like
-# MakeProfiles to operate in 3D).
-for prog in arithmetic buildprog convertt convolve cosmiccal crop fits  \
-            match mkcatalog mknoise mkprof noisechisel statistics table \
-            warp
+# easy readability. Note that some programs may need to build their
+# configuration files during compilation. Hence, their configuration files
+# are in the build directory, not the source directory.
+for prog in arithmetic buildprog convertt convolve cosmiccal crop fits \
+            match mkcatalog mknoise mkprof noisechisel statistics table warp
 do
-    cp $topsrc/bin/$prog/ast*.conf .gnuastro/
+    if test -f $topsrc/bin/$prog/ast$prog.conf; then
+        ctopdir=$topsrc
+    else
+        ctopdir=$topbuild
+    fi
+    cp $ctopdir/bin/$prog/*.conf .gnuastro/
 done
diff --git a/tests/statistics/basicstats.sh b/tests/statistics/basicstats.sh
index d67bab6..c850702 100755
--- a/tests/statistics/basicstats.sh
+++ b/tests/statistics/basicstats.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/statistics/estimate_sky.sh b/tests/statistics/estimate_sky.sh
index 8ffe2da..6e43a38 100755
--- a/tests/statistics/estimate_sky.sh
+++ b/tests/statistics/estimate_sky.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/table/fits-ascii-to-txt.sh b/tests/table/fits-ascii-to-txt.sh
index 9be3d5d..c86762e 100755
--- a/tests/table/fits-ascii-to-txt.sh
+++ b/tests/table/fits-ascii-to-txt.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/table/fits-binary-to-txt.sh 
b/tests/table/fits-binary-to-txt.sh
index 29280f7..a98826e 100755
--- a/tests/table/fits-binary-to-txt.sh
+++ b/tests/table/fits-binary-to-txt.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/table/txt-to-fits-ascii.sh b/tests/table/txt-to-fits-ascii.sh
index 3c5fcd9..7f6eea0 100755
--- a/tests/table/txt-to-fits-ascii.sh
+++ b/tests/table/txt-to-fits-ascii.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/table/txt-to-fits-binary.sh 
b/tests/table/txt-to-fits-binary.sh
index 582352d..9649de7 100755
--- a/tests/table/txt-to-fits-binary.sh
+++ b/tests/table/txt-to-fits-binary.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/warp/homographic.sh b/tests/warp/homographic.sh
index acf78d7..58ac8c2 100755
--- a/tests/warp/homographic.sh
+++ b/tests/warp/homographic.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tests/warp/warp_scale.sh b/tests/warp/warp_scale.sh
index 9bbe0e2..8f91674 100755
--- a/tests/warp/warp_scale.sh
+++ b/tests/warp/warp_scale.sh
@@ -4,7 +4,7 @@
 # (in the Installing gnuastro section).
 #
 # Original author:
-#     Mohammad Akhlaghi <akhlaghi@gnu.org>
+#     Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #
 # Copying and distribution of this file, with or without modification,
diff --git a/tmpfs-config-make b/tmpfs-config-make
index 41cc305..5149bcf 100755
--- a/tmpfs-config-make
+++ b/tmpfs-config-make
@@ -5,10 +5,10 @@
 # in RAM" section of the Gnuastro book/documentation for a full
 # explanation.
 #
-# Original author: Mohammad Akhlaghi <akhlaghi@gnu.org>
+# Original author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Contributing author(s):
 #   Mosè Giordano <mose@gnu.org>
-# Copyright (C) 2016, Free Software Foundation, Inc.
+# Copyright (C) 2016-2018, Free Software Foundation, Inc.
 #
 # Gnuastro is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free



reply via email to

[Prev in Thread] Current Thread [Next in Thread]