diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2a0fd4d7322b504e5cbccda7a8bdf20c2313881..1f3e966dee3cea8f67c9a095d985ad618738b236 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 818dd8cdc1cf0c681a7724f22783112e0eb19e74..07d1c272a0deccd6b5274a2895db0295844f70ba 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_PROJECT_NAME ${CUSTOM_DROP_PROJECT})
 set(CTEST_DROP_METHOD "http")
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 19887bb9845a4d19548e59a10361f921582d7aa3..e17854eb26adfd3284204179d8bb3b18b49edb6e 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC  
   Gmsh.cpp
diff --git a/Common/Colors.h b/Common/Colors.h
index 652c4079a1448765934360b749356cd4ea5d8c31..f955384db0b8ea495d3405aeb0650d3dc7f36fce 100644
--- a/Common/Colors.h
+++ b/Common/Colors.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _COLORS_H_
 #define _COLORS_H_
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index ce4ff5a2a759aeb0eaf3987c9cdc458abd32d449..7666c410ad91db252bf11222aedf17944677d57d 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <string.h>
@@ -989,8 +989,8 @@ void GetOptions(int argc, char *argv[])
                 MED_NUM_MINEUR, MED_NUM_RELEASE);
 #endif
         fprintf(stderr, "Packaged by      : %s\n", GMSH_PACKAGER);
-        fprintf(stderr, "Web site         : http://www.geuz.org/gmsh/\n");
-        fprintf(stderr, "Mailing list     : gmsh@geuz.org\n");
+        fprintf(stderr, "Web site         : http://gmsh.info\n");
+        fprintf(stderr, "Mailing list     : gmsh@onelab.info\n");
         Msg::Exit(0);
       }
       else if(!strcmp(argv[i] + 1, "help") || !strcmp(argv[i] + 1, "-help")) {
diff --git a/Common/CommandLine.h b/Common/CommandLine.h
index 473ed08f9149630ad1bc7e21e4f97e7f7bf4da8a..76de8b65004ca95a284c6047b343255ecaa78c81 100644
--- a/Common/CommandLine.h
+++ b/Common/CommandLine.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _COMMAND_LINE_H_
 #define _COMMAND_LINE_H_
diff --git a/Common/Context.cpp b/Common/Context.cpp
index 2c2ac3bdbbf25bdfcd3f19d2c9515cffcf15efd8..d00d8f0be8080a6711368d49fbcf81d1e6c12ec6 100644
--- a/Common/Context.cpp
+++ b/Common/Context.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Common/Context.h b/Common/Context.h
index c0759dfddb6e8abbb9d958b4919fc85078e078dd..e08c318c3fe4bb60818e3229c2f859e9dc7e7e56 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CONTEXT_H_
 #define _CONTEXT_H_
diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index 8b3f2fa7075956dbde8cebf30c8c8eaa1ed101d4..57b87fafb88ed6267952f5695ba7966ae2c99661 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Common/CreateFile.h b/Common/CreateFile.h
index 86bb04ffbc9f5be2c6b8a8f2080f5315e88ad48f..3ed55cb0f64a9e3c6e7f49f6fb27a00e878215c5 100644
--- a/Common/CreateFile.h
+++ b/Common/CreateFile.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CREATE_FILE_H_
 #define _CREATE_FILE_H_
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 9c500b5985e19e262b12b2487ad99f3c8f02ad37..69248ace998b8da92e980c06a7cee12bb084f93b 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DEFAULT_OPTIONS_H_
 #define _DEFAULT_OPTIONS_H_
diff --git a/Common/GamePad.cpp b/Common/GamePad.cpp
index 02368434ad55c898f061b96e9c05fb7d37e05a47..f9af28d4b22cdbd37975d12ee19d4f9e33b84c9d 100644
--- a/Common/GamePad.cpp
+++ b/Common/GamePad.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 //    default map is "THRUSTMASTER FireStorm Dual Power"-like
diff --git a/Common/GamePad.h b/Common/GamePad.h
index dda16e197cca486c52df04fea75bf2a5c6a35102..ea9d6e8e16b046f7d3402635ed817b2525662bda 100644
--- a/Common/GamePad.h
+++ b/Common/GamePad.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 
diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp
index 7fb9fa81a6f794115379c352dc1e3ffbe2fe0fcb..c4a1449a929ff932312ce8a23e38f489a7cb368d 100644
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <time.h>
diff --git a/Common/Gmsh.h b/Common/Gmsh.h
index 98debda065c16d16619357343d35a29882cb7887..e50a4d7f2bc69b353f0b3d01d7866ef335d3d9ea 100644
--- a/Common/Gmsh.h
+++ b/Common/Gmsh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_H_
 #define _GMSH_H_
diff --git a/Common/GmshConfig.h.in b/Common/GmshConfig.h.in
index 97d878986ae38eac04f91c5ce5584c5b09900181..0ae858976df1d91a2cf5a836a4745dc555bc1ce5 100644
--- a/Common/GmshConfig.h.in
+++ b/Common/GmshConfig.h.in
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_CONFIG_H_
 #define _GMSH_CONFIG_H_
diff --git a/Common/GmshDefines.h b/Common/GmshDefines.h
index c9758cf5faef402b2ed9b822ab6583a28959010e..85592a19fbc0c5a1280db8b56978f6b05ce6f593 100644
--- a/Common/GmshDefines.h
+++ b/Common/GmshDefines.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_DEFINES_H_
 #define _GMSH_DEFINES_H_
diff --git a/Common/GmshIO.h b/Common/GmshIO.h
index 12ac54fcb7f3117b078b1f9b9a4ecee5b06f9c7c..7043915e5ba4764d79f1fe4b7515110d97b57b9c 100644
--- a/Common/GmshIO.h
+++ b/Common/GmshIO.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contribued by Alexis Salzman
 
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index c228b7d46f712a3d8182c9547de0fc2656a9dbdf..7b51e85ac3a34b1189737b771c4ddfd0ca2c1e04 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Common/GmshMessage.h b/Common/GmshMessage.h
index d0ad5a6f9f371c72c2917a57476abf1f2ccb8a83..bf6504b60c8a9546ee4ea38cb91ed5947086e2cb 100644
--- a/Common/GmshMessage.h
+++ b/Common/GmshMessage.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_MESSAGE_H_
 #define _GMSH_MESSAGE_H_
diff --git a/Common/GmshRemote.cpp b/Common/GmshRemote.cpp
index 3c373dbe7b59e769b6b56f2d74fb73023b28fb28..9ca7d10ec27aaaed07b9047e1b740aaa9f6a4837 100644
--- a/Common/GmshRemote.cpp
+++ b/Common/GmshRemote.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Common/GmshRemote.h b/Common/GmshRemote.h
index 3637f3f562d959de4308ab72e7f89adfc34ad467..c0077928e0ce700a964c866af5aaf41c041689d6 100644
--- a/Common/GmshRemote.h
+++ b/Common/GmshRemote.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_REMOTE_H_
 #define _GMSH_REMOTE_H_
diff --git a/Common/GmshSocket.h b/Common/GmshSocket.h
index 824d7f12aa9b6c0a32388b1ff990089e9fe65228..4015540075ec1ec0a2e886d59bb725f31602a354 100644
--- a/Common/GmshSocket.h
+++ b/Common/GmshSocket.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _GMSH_SOCKET_H_
 #define _GMSH_SOCKET_H_
diff --git a/Common/GmshVersion.h.in b/Common/GmshVersion.h.in
index 275b12b4b94becd65977beb1018afb70ed2f5dcb..a66e8d076fe88b01f5831051d17adee46a9b91d4 100644
--- a/Common/GmshVersion.h.in
+++ b/Common/GmshVersion.h.in
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_VERSION_H_
 #define _GMSH_VERSION_H_
diff --git a/Common/Hash.h b/Common/Hash.h
index 509a5e6e0515db27f22248529583d23d4b2c4bc2..349fac328094f8a15b1b177d1b47a80c5f687ca2 100644
--- a/Common/Hash.h
+++ b/Common/Hash.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HASH_H_
 #define _HASH_H_
diff --git a/Common/HashMap.h b/Common/HashMap.h
index 9be4736e9d9264637b1377bb3ac5a4921c9f89d4..29ad02c79cbd0881b89577ca2ab4a6c12341f059 100644
--- a/Common/HashMap.h
+++ b/Common/HashMap.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HASH_MAP_H_
 #define _HASH_MAP_H_
diff --git a/Common/ListUtils.cpp b/Common/ListUtils.cpp
index ba0beb2d7dcb55380b6fe0c7f14b3c428b123b36..691fec09154a9f0f796054e4955b70088c0f2e15 100644
--- a/Common/ListUtils.cpp
+++ b/Common/ListUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Marc Ume
diff --git a/Common/ListUtils.h b/Common/ListUtils.h
index 3b1cc7e0d1c6b6f0442193ed0c94c6bc9ae517c4..40d5de571f976abdc350fdd2dbd5feed57cb9e9b 100644
--- a/Common/ListUtils.h
+++ b/Common/ListUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LIST_UTILS_H_
 #define _LIST_UTILS_H_
diff --git a/Common/Main.cpp b/Common/Main.cpp
index d775f9088ba725790f14bcab003a216ef23fbbe2..7e996a0ba1795add42b05931d51e1e00e35b52ee 100644
--- a/Common/Main.cpp
+++ b/Common/Main.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Common/MallocUtils.cpp b/Common/MallocUtils.cpp
index 34116b10c4ffcf039c80a9a06c4744f5f21e7b5d..c46d2281bad56240325c0a388cb62c24de530be0 100644
--- a/Common/MallocUtils.cpp
+++ b/Common/MallocUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Common/MallocUtils.h b/Common/MallocUtils.h
index 82e06d73b73eae49dec40a113ab7131855432b55..8dfd4a7502070369233ad1f3a05a8decbe6cb1af 100644
--- a/Common/MallocUtils.h
+++ b/Common/MallocUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MALLOC_UTILS_H_
 #define _MALLOC_UTILS_H_
diff --git a/Common/OS.cpp b/Common/OS.cpp
index 1346ce349315457c35121f8768406099df4ea1f2..2c9825286b567a66cd2ec6be0ef9977616fb3d43 100644
--- a/Common/OS.cpp
+++ b/Common/OS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // This file contains a bunch of functions that depend on OS-dependent
 // features and/or system calls
diff --git a/Common/OS.h b/Common/OS.h
index dcef3e6f41dd4b03f06d92f4c858ae5288fa34aa..2fae7ff2377b9cbe255323f84d1b7fd97895802c 100644
--- a/Common/OS.h
+++ b/Common/OS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OS_H_
 #define _OS_H_
diff --git a/Common/Octree.cpp b/Common/Octree.cpp
index da830e36f9d78b601af06730fe6b705c2e840a27..9293aed02c53358103d11568fbf7244c128bbc01 100644
--- a/Common/Octree.cpp
+++ b/Common/Octree.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/Common/Octree.h b/Common/Octree.h
index 5d5c205722355ec9227697ab282465021ce4f7f1..2ca5a87d7c3f74fc12b39d765c25e70e2efeb226 100644
--- a/Common/Octree.h
+++ b/Common/Octree.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCTREE_H_
 #define _OCTREE_H_
diff --git a/Common/OctreeInternals.cpp b/Common/OctreeInternals.cpp
index 6d8d3643a8610a4c79aba3fa685f87a5543b64be..10f8b92069d463ecea82b463cbc7edf784af94a9 100644
--- a/Common/OctreeInternals.cpp
+++ b/Common/OctreeInternals.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <list>
 #include <stdio.h>
diff --git a/Common/OctreeInternals.h b/Common/OctreeInternals.h
index 2d25fbcdb63e900e41ea3f159d5a0659d9b090b8..2c13e66dba898f9c0c757ded3bce51bba061e653 100644
--- a/Common/OctreeInternals.h
+++ b/Common/OctreeInternals.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCTREE_INTERNALS_H_
 #define _OCTREE_INTERNALS_H_
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index f8e5fb7b186d1eef9a0bc4f3f862edb53a83be8a..711daa5d2b77e398f3c1a026479ad6d926fcd144 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <string.h>
diff --git a/Common/OpenFile.h b/Common/OpenFile.h
index ecd036640402904dbbcf48131c9482310fd521f2..cea05a87bb060e6120003c43c2d6498eef49bf8b 100644
--- a/Common/OpenFile.h
+++ b/Common/OpenFile.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OPENFILE_H_
 #define _OPENFILE_H_
diff --git a/Common/Options.cpp b/Common/Options.cpp
index a2853222fbb9b9f8542add747a8ec54f7d5efeb5..e54d7756b9fee72a16f5d41df29137725d148c83 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/Common/Options.h b/Common/Options.h
index 51e55348677aa522ffa850b5370332acdc1d06bf..6d85ca161cf18c615024bcb4d823a50014a98691 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OPTIONS_H_
 #define _OPTIONS_H_
diff --git a/Common/SmoothData.cpp b/Common/SmoothData.cpp
index 4f83ec39ce70c8b5d8c8077cc3811f1a546192a6..0357536645a9790f239835e4bae079ddbe7e60b6 100644
--- a/Common/SmoothData.cpp
+++ b/Common/SmoothData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include "SmoothData.h"
diff --git a/Common/SmoothData.h b/Common/SmoothData.h
index de6346dc4bd73c72d20ea2ba1653421365eafa76..5971927c2d0c4080b6a2c6fe80825185772e403d 100644
--- a/Common/SmoothData.h
+++ b/Common/SmoothData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SMOOTH_DATA_H_
 #define _SMOOTH_DATA_H_
diff --git a/Common/StringUtils.cpp b/Common/StringUtils.cpp
index 0229c90fa4bc9a06b39fd866d4cf3cfaafbb2fc3..0f06035d144276b7fb021ebd47d35861d3f67c4d 100644
--- a/Common/StringUtils.cpp
+++ b/Common/StringUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #if defined(__CYGWIN__)
diff --git a/Common/StringUtils.h b/Common/StringUtils.h
index bc98b4a418937a28b2659f30b350bc10f4f1b9a1..629a454782a35229a22cd7c6bc525c68e8852751 100644
--- a/Common/StringUtils.h
+++ b/Common/StringUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _STRING_UTILS_H_
 #define _STRING_UTILS_H_
diff --git a/Common/TreeUtils.cpp b/Common/TreeUtils.cpp
index e448ed35e3c55d44c8cf3fa12999cc1312f5e961..e35b5e8ef329eb11a4f58f2183c02c354ead081f 100644
--- a/Common/TreeUtils.cpp
+++ b/Common/TreeUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Marc Ume
diff --git a/Common/TreeUtils.h b/Common/TreeUtils.h
index bf3f088606f80c4aa102959ff4f830e79f0bcac4..d4b9470803945a3740c421b6b1fe61e847ee9648 100644
--- a/Common/TreeUtils.h
+++ b/Common/TreeUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TREE_UTILS_H_
 #define _TREE_UTILS_H_
diff --git a/Common/VertexArray.cpp b/Common/VertexArray.cpp
index fa2a25899ad07b5585379552a13c9b1f32743dc4..d227bbae86407eb4124b1ece07fdb7a5c38c5065 100644
--- a/Common/VertexArray.cpp
+++ b/Common/VertexArray.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <algorithm>
diff --git a/Common/VertexArray.h b/Common/VertexArray.h
index 22f43a037ad8d20dd91e6bf4cd4a898b900d87e5..b882b9a5433f11a0fd4eb92bc90d291c57abdc1a 100644
--- a/Common/VertexArray.h
+++ b/Common/VertexArray.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _VERTEX_ARRAY_H_
 #define _VERTEX_ARRAY_H_
diff --git a/Common/gmshLocalNetworkClient.cpp b/Common/gmshLocalNetworkClient.cpp
index 4c67dba5ecc98788119ccd417d8c7f6ec1d432b9..e90731f29bb8243cfa69ed9f310a9a36607d9cb7 100644
--- a/Common/gmshLocalNetworkClient.cpp
+++ b/Common/gmshLocalNetworkClient.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "Gmsh.h"
diff --git a/Common/gmshLocalNetworkClient.h b/Common/gmshLocalNetworkClient.h
index 95d0b5d5a8055dd403d9bbadfb3858abe5883a17..777856d78336804c9b2df19a3476b19b67ebc157 100644
--- a/Common/gmshLocalNetworkClient.h
+++ b/Common/gmshLocalNetworkClient.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_LOCAL_NETWORK_CLIENT_H_
 #define _GMSH_LOCAL_NETWORK_CLIENT_H_
diff --git a/Common/gmshPopplerWrapper.cpp b/Common/gmshPopplerWrapper.cpp
index d4856c3f8838e6d499b132c678897e808048f844..68e76f28dff482472877f7afeb00c5f36d999cb0 100644
--- a/Common/gmshPopplerWrapper.cpp
+++ b/Common/gmshPopplerWrapper.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "gmshPopplerWrapper.h"
 
diff --git a/Common/gmshPopplerWrapper.h b/Common/gmshPopplerWrapper.h
index 10310e447bc31144f6af35a434edad945554632b..3da03290452dd123ada2d98a59d93cedb1d8d9e2 100644
--- a/Common/gmshPopplerWrapper.h
+++ b/Common/gmshPopplerWrapper.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSHPOPPLERWRAPPER_PDF_H_
 #define _GMSHPOPPLERWRAPPER_PDF_H_
diff --git a/Common/onelab.h b/Common/onelab.h
index f57eb6ec1c2661363be6b374695fd82a83d531d8..0ebdb4e005475bf030f55078202aaa316df1dbc1 100644
--- a/Common/onelab.h
+++ b/Common/onelab.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _ONELAB_H_
 #define _ONELAB_H_
diff --git a/Common/onelabUtils.cpp b/Common/onelabUtils.cpp
index 5ad1360921c44b1dee3ba5af88b781f837470b6c..ccb5138120ce6c34b4e8deae73a87bafbfbdddc8 100644
--- a/Common/onelabUtils.cpp
+++ b/Common/onelabUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Common/onelabUtils.h b/Common/onelabUtils.h
index 26a0c42117fb28c1aa8495b30c73570be8ed0e01..595b700c04fbbb016f8570de10f444e1873b5e38 100644
--- a/Common/onelabUtils.h
+++ b/Common/onelabUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ONELAB_UTILS_H_
 #define _ONELAB_UTILS_H_
diff --git a/Fltk/CMakeLists.txt b/Fltk/CMakeLists.txt
index def058869d43a9b23ecc84bb360d34d432e5c0be..a8740ea4b5077442b37c74dc495b39e2c823f930 100644
--- a/Fltk/CMakeLists.txt
+++ b/Fltk/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   FlGui.cpp
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index 8db38e5aa18b653b0fcf96b6b6baa90e6ba709c5..9a7ad00061c5c8246bbe30f7a524e491f0f7cde1 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/FlGui.h b/Fltk/FlGui.h
index a3ae525888b43041a065020b788a52efc9e4c2a1..d47689577ed0a8e60478a2dcd0b4735803f5897b 100644
--- a/Fltk/FlGui.h
+++ b/Fltk/FlGui.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FL_GUI_H_
 #define _FL_GUI_H_
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index e07b601cb1f4326a7c9283c3fb2e596fc1d5d305..d708f7d6e639517d4b6bfebadf8047de8f78a926 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string>
diff --git a/Fltk/Navigator.cpp b/Fltk/Navigator.cpp
index 8ae9d1089b3fb3595d9f94af2018ce67120750d7..4e281c6c6fc56d53c13bfdc261991d84bfa8bc72 100644
--- a/Fltk/Navigator.cpp
+++ b/Fltk/Navigator.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 
diff --git a/Fltk/Navigator.h b/Fltk/Navigator.h
index 20029a12885f929384883acdb2939d0c0fddd7dd..2814ff3acdd51472884d934b551f6c545b85c41e 100644
--- a/Fltk/Navigator.h
+++ b/Fltk/Navigator.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 //
diff --git a/Fltk/classificationEditor.cpp b/Fltk/classificationEditor.cpp
index 9ab8aa9ac4c29147c3581fe3553162a96391b565..6660df828abf6691de1186120d1ae8d5e328077d 100644
--- a/Fltk/classificationEditor.cpp
+++ b/Fltk/classificationEditor.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Box.H>
diff --git a/Fltk/classificationEditor.h b/Fltk/classificationEditor.h
index 434f52025b82888e7ad40a408b1d438fff9698da..2e929c7d2f605a17a89b00efa1d46dc74d604219 100644
--- a/Fltk/classificationEditor.h
+++ b/Fltk/classificationEditor.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CLASSIFICATION_EDITOR_H_
 #define _CLASSIFICATION_EDITOR_H_
diff --git a/Fltk/clippingWindow.cpp b/Fltk/clippingWindow.cpp
index 8a873e41effbb3c42b3f296962197aedf4265898..ed435f023bc51db4304a08c97f51ef27ba8c1fbb 100644
--- a/Fltk/clippingWindow.cpp
+++ b/Fltk/clippingWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Return_Button.H>
diff --git a/Fltk/clippingWindow.h b/Fltk/clippingWindow.h
index 8f83e42e15edc6629922cf1283a9729f84ebea69..6b5d489dd4aff0bf4272226170e413cf2ca90ac9 100644
--- a/Fltk/clippingWindow.h
+++ b/Fltk/clippingWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CLIPPING_WINDOW_H_
 #define _CLIPPING_WINDOW_H_
diff --git a/Fltk/colorbarWindow.cpp b/Fltk/colorbarWindow.cpp
index 090fe26cfd1878daaec290c20bb5a9675dd8243a..60b1881f13cc783e6ec45e03b7b8579340c3f92b 100644
--- a/Fltk/colorbarWindow.cpp
+++ b/Fltk/colorbarWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // This class was inspired by the colorbar widget provided in Vis5d, a
 // program for visualizing five dimensional gridded data sets
diff --git a/Fltk/colorbarWindow.h b/Fltk/colorbarWindow.h
index d61c050590dc63986d26ba9bd52ef8226cf757bf..95836893210562b433a059c1b07f23ab39a14293 100644
--- a/Fltk/colorbarWindow.h
+++ b/Fltk/colorbarWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _COLORBAR_WINDOW_H
 #define _COLORBAR_WINDOW_H
diff --git a/Fltk/contextWindow.cpp b/Fltk/contextWindow.cpp
index 17728a3cf26a3a3c6f3916392eba85be1f4bf089..c5326893e963515747aa51b5b9efb025b96ee4cc 100644
--- a/Fltk/contextWindow.cpp
+++ b/Fltk/contextWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Return_Button.H>
diff --git a/Fltk/contextWindow.h b/Fltk/contextWindow.h
index f0e6d86b708d6aa4e00beb8223a53cd6484d5023..b2406db058068a021ef4f14af7dc5b1434820db1 100644
--- a/Fltk/contextWindow.h
+++ b/Fltk/contextWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CONTEXT_WINDOW_H_
 #define _CONTEXT_WINDOW_H_
diff --git a/Fltk/drawContextFltk.h b/Fltk/drawContextFltk.h
index 9681d6d62c4683e8b40671165cbeed8ca21bcec8..c3babe88f50cd73bea41ce6dc7952b5ca881d28b 100644
--- a/Fltk/drawContextFltk.h
+++ b/Fltk/drawContextFltk.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DRAW_CONTEXT_FLTK_H_
 #define _DRAW_CONTEXT_FLTK_H_
diff --git a/Fltk/drawContextFltkCairo.cpp b/Fltk/drawContextFltkCairo.cpp
index 23db76ffb2af99a7ebe9e06105cde0f265f6b28c..c10e3badf711fb7f2545a695c2007270e54fe12e 100644
--- a/Fltk/drawContextFltkCairo.cpp
+++ b/Fltk/drawContextFltkCairo.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Jonathan Lambrechts
 
diff --git a/Fltk/drawContextFltkCairo.h b/Fltk/drawContextFltkCairo.h
index dd7f9f9a5a7934e2da6128254e84022a6dd09410..02150f7bb08e2177dd50f0c21f680ae4bc5afacb 100644
--- a/Fltk/drawContextFltkCairo.h
+++ b/Fltk/drawContextFltkCairo.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Jonathan Lambrechts
 
diff --git a/Fltk/drawContextFltkStringTexture.cpp b/Fltk/drawContextFltkStringTexture.cpp
index 7d45ce19fc3ef847d5830df8158f27c29d3d71c1..81b90ca173f723868d0d72b779dd6cdd082d65a6 100644
--- a/Fltk/drawContextFltkStringTexture.cpp
+++ b/Fltk/drawContextFltkStringTexture.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Jonathan Lambrechts
 
diff --git a/Fltk/drawContextFltkStringTexture.h b/Fltk/drawContextFltkStringTexture.h
index 2846e99ff6840fda894c53ddfc3a937616bb9221..1b6924efa1cbff085678ec432cf4eef97a3f2d04 100644
--- a/Fltk/drawContextFltkStringTexture.h
+++ b/Fltk/drawContextFltkStringTexture.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Jonathan Lambrechts
 
diff --git a/Fltk/extraDialogs.cpp b/Fltk/extraDialogs.cpp
index f7e94f5324ae368cfdf8b356fcd21c92acdc5e1b..fda24f3d843d676c4cb448751f67c49323b22416 100644
--- a/Fltk/extraDialogs.cpp
+++ b/Fltk/extraDialogs.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Stephen Guzik
diff --git a/Fltk/extraDialogs.h b/Fltk/extraDialogs.h
index 4ca1abf7a6899d9b33529120560f6a7d36af76b5..e47e280eea28aa060ae8a576f46e3c5fee33b57e 100644
--- a/Fltk/extraDialogs.h
+++ b/Fltk/extraDialogs.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EXTRA_DIALOGS_H_
 #define _EXTRA_DIALOGS_H_
diff --git a/Fltk/fieldWindow.cpp b/Fltk/fieldWindow.cpp
index 0d2231e009e974d72bafbca1266089759def9031..0b72b7f5693fabb64f72deea37d42ff797d7b33f 100644
--- a/Fltk/fieldWindow.cpp
+++ b/Fltk/fieldWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Jonathan Lambrechts
diff --git a/Fltk/fieldWindow.h b/Fltk/fieldWindow.h
index fb72de1d792ee0f0123b92e4300afe8eacf99095..ee3b7674d74e5c9fdf94c31e9471a8ea8b8d74ea 100644
--- a/Fltk/fieldWindow.h
+++ b/Fltk/fieldWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIELD_WINDOW_H_
 #define _FIELD_WINDOW_H_
diff --git a/Fltk/fileDialogs.cpp b/Fltk/fileDialogs.cpp
index 4bc0e7ea8dd6763f2fa751b7fde1d111490cc094..2f91a141273fb179f660e422d0bfc712dd7d97be 100644
--- a/Fltk/fileDialogs.cpp
+++ b/Fltk/fileDialogs.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Stephen Guzik
diff --git a/Fltk/fileDialogs.h b/Fltk/fileDialogs.h
index 58b7543623a0c3c820a210b92c4ab9a961ead2b9..c26783865d7b67a138ffad6b1f3bd08a6f99a856 100644
--- a/Fltk/fileDialogs.h
+++ b/Fltk/fileDialogs.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FILE_DIALOGS_H_
 #define _FILE_DIALOGS_H_
diff --git a/Fltk/gamepadWindow.cpp b/Fltk/gamepadWindow.cpp
index 064dfcfbaa91c522ceaeea04e59c89322c574cec..4c6544ffcb534824e2dd97e41e1408541b235b41 100644
--- a/Fltk/gamepadWindow.cpp
+++ b/Fltk/gamepadWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/gamepadWindow.h b/Fltk/gamepadWindow.h
index 210c1ed100ec3cf78f694e8e4a5b66ecc53cd211..63a788a5b27ebba070a2516d815f8740d58bbcb7 100644
--- a/Fltk/gamepadWindow.h
+++ b/Fltk/gamepadWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GAMEPAD_WINDOW_H_
 #define _GAMEPAD_WINDOW_H_
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 4198fc3d2d06b631205f93f145007805a23e59e4..1072ff4c2f9c668fdf0fbd63515b9bfa3ecdd873 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshDefines.h"
@@ -324,8 +324,8 @@ static int _save_view_med(const char *name){ return genericViewFileDialog
 static int _save_view_txt(const char *name){ return genericViewFileDialog
     (name, "TXT Options", 4); }
 
-//static int _save_view_wrl(const char *name){ return genericViewFileDialog    (name, "X3D Options", 7); } 
-static int _save_view_x3d(const char *name){ return x3dViewFileDialog    (name, "X3D Options", 7); } 
+//static int _save_view_wrl(const char *name){ return genericViewFileDialog    (name, "X3D Options", 7); }
+static int _save_view_x3d(const char *name){ return x3dViewFileDialog    (name, "X3D Options", 7); }
 
 
 static int _save_auto(const char *name)
@@ -551,7 +551,7 @@ void file_watch_cb(Fl_Widget *w, void *data)
 
 static void help_online_cb(Fl_Widget *w, void *data)
 {
-  fl_open_uri("http://geuz.org/gmsh/doc/texinfo/");
+  fl_open_uri("http://gmsh.info/doc/texinfo/");
 }
 
 static void help_basic_cb(Fl_Widget *w, void *data)
diff --git a/Fltk/graphicWindow.h b/Fltk/graphicWindow.h
index 319a01c576d0847974cbcf7404dde7cf71b4829a..58b2da58ff8e2869b7296f65ceb21551d08bf918 100644
--- a/Fltk/graphicWindow.h
+++ b/Fltk/graphicWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GRAPHIC_WINDOW_H_
 #define _GRAPHIC_WINDOW_H_
diff --git a/Fltk/helpWindow.cpp b/Fltk/helpWindow.cpp
index ecb18d59b6ee2e214edc1dc2dc4b2fbef9bfb8e4..9d7074e1f68809f562861d18b92ece84c23e61d5 100644
--- a/Fltk/helpWindow.cpp
+++ b/Fltk/helpWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <algorithm>
@@ -301,11 +301,11 @@ helpWindow::helpWindow()
     sstream << "<center><h3>Gmsh</h3><br>version " << GetGmshVersion()
             << "<p>Copyright (C) 1997-2016"
             << "<br>Christophe Geuzaine and Jean-Francois Remacle"
-            << "<p><a href=\"http://geuz.org/gmsh/doc/CREDITS.txt\">Credits</a> "
-            << "and <a href=\"http://geuz.org/gmsh/doc/LICENSE.txt\">licensing "
+            << "<p><a href=\"http://gmsh.info/doc/CREDITS.txt\">Credits</a> "
+            << "and <a href=\"http://gmsh.info/doc/LICENSE.txt\">licensing "
             << "information</a>"
             << "<p>Please send all questions and bug reports to the public mailing list "
-            << "<a href=\"mailto:gmsh@geuz.org\">gmsh@geuz.org</a></center>"
+            << "<a href=\"mailto:gmsh@onelab.info\">gmsh@onelab.info</a></center>"
             << "<ul>"
             << "<li><i>Build OS:</i> " << GetGmshBuildOS()
             << "<li><i>Build date:</i> " << GetGmshBuildDate()
@@ -332,7 +332,7 @@ helpWindow::helpWindow()
 #endif
             << "<li><i>Packaged by:</i> " << GetGmshPackager()
             << "</ul>"
-            << "<center>Visit <a href=\"http://geuz.org/gmsh/\">http://geuz.org/gmsh/</a> "
+            << "<center>Visit <a href=\"http://gmsh.info\">http://gmsh.info</a> "
             << "for more information</center>";
     o->value(sstream.str().c_str());
     o->link(help_link);
diff --git a/Fltk/helpWindow.h b/Fltk/helpWindow.h
index 7a7d89e5cf5bd85ebeca552732096b8c391e85f9..27a874fcf6b86feec35fce9136a04e24b3c58c3b 100644
--- a/Fltk/helpWindow.h
+++ b/Fltk/helpWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HELP_WINDOW_H_
 #define _HELP_WINDOW_H_
diff --git a/Fltk/highOrderToolsWindow.cpp b/Fltk/highOrderToolsWindow.cpp
index 6b11d2f3a69d967c6251c1d55efecbe96004bd2e..0cb2a7ae594560347a48dd8ef40750aa7df848fb 100644
--- a/Fltk/highOrderToolsWindow.cpp
+++ b/Fltk/highOrderToolsWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include <string>
diff --git a/Fltk/highOrderToolsWindow.h b/Fltk/highOrderToolsWindow.h
index 0926c0fd3f84e9f8bbe89b3446c7558eae6232f8..ca10307b983572ca4f02819804ae9bf34e4da7eb 100644
--- a/Fltk/highOrderToolsWindow.h
+++ b/Fltk/highOrderToolsWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HIGHORDERTOOLS_WINDOW_H_
 #define _HIGHORDERTOOLS_WINDOW_H_
diff --git a/Fltk/inputRange.h b/Fltk/inputRange.h
index 3894a7e70926d555acffbf2e27994af5e12723be..bc928f7a4a6f804f522c603e659e723b00e6f797 100644
--- a/Fltk/inputRange.h
+++ b/Fltk/inputRange.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INPUT_RANGE_H_
 #define _INPUT_RANGE_H_
diff --git a/Fltk/inputRegion.cpp b/Fltk/inputRegion.cpp
index ce4e79e57a423f760558ade3c5cde9d577c3fb76..2e1f21e52a5be03e0b636842f23e389316f64b8e 100644
--- a/Fltk/inputRegion.cpp
+++ b/Fltk/inputRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <stdio.h>
diff --git a/Fltk/inputRegion.h b/Fltk/inputRegion.h
index 184c70c3cc423cafbecf4c8238f1acab447dbcf2..e5107801689c1a3885a3b2ccd972cadc65b5ab78 100644
--- a/Fltk/inputRegion.h
+++ b/Fltk/inputRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INPUT_REGION_H_
 #define _INPUT_REGION_H_
diff --git a/Fltk/inputValue.cpp b/Fltk/inputValue.cpp
index 2eaa9e7016afc757e82f2afe86d0eace21fe37da..972f469b914d8be9503b2da1bcca97fdb6552f33 100644
--- a/Fltk/inputValue.cpp
+++ b/Fltk/inputValue.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "inputValue.h"
 #include <FL/Fl_Group.H>
diff --git a/Fltk/inputValue.h b/Fltk/inputValue.h
index 83a65a0ee1ca1686238e2c1adedd8cbe26abde7d..103429423c41da1c8e2864b228c33adc7584a808 100644
--- a/Fltk/inputValue.h
+++ b/Fltk/inputValue.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INPUT_VALUE_H_
 #define _INPUT_VALUE_H_
diff --git a/Fltk/mainWindow.h b/Fltk/mainWindow.h
index be1dda9675cd939be3b842c0b72258bcf22aaadb..c4e588bd439f2e9334a0522a82052955232ca15c 100644
--- a/Fltk/mainWindow.h
+++ b/Fltk/mainWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MAIN_WINDOW_H
 #define _MAIN_WINDOW_H
diff --git a/Fltk/manipWindow.cpp b/Fltk/manipWindow.cpp
index 7d83b457aa11966f2d6cfd8926e10531125d7a0a..aa3f7dac57418e758ad810af57c19468f22f1bae 100644
--- a/Fltk/manipWindow.cpp
+++ b/Fltk/manipWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Return_Button.H>
diff --git a/Fltk/manipWindow.h b/Fltk/manipWindow.h
index 5b8da2afd4f17dd62adfd33742b96b9bea8c9428..1df9ca048abf6b8c5296b332b0eb54e5eb7f72f6 100644
--- a/Fltk/manipWindow.h
+++ b/Fltk/manipWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MANIP_WINDOW_H_
 #define _MANIP_WINDOW_H_
diff --git a/Fltk/onelabGroup.cpp b/Fltk/onelabGroup.cpp
index 9f21c286cf5bc8d309da6e54f45d3f61d606dfee..933a124f983029d62e2a62a211f8dbbfac5888ee 100644
--- a/Fltk/onelabGroup.cpp
+++ b/Fltk/onelabGroup.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl.H>
 #include "GmshConfig.h"
diff --git a/Fltk/onelabGroup.h b/Fltk/onelabGroup.h
index 494bf3f92b7d36ed61ba2e279fb8f8dff706895a..271e7c383399aae5c0db3ae9194109da2b5e4b0a 100644
--- a/Fltk/onelabGroup.h
+++ b/Fltk/onelabGroup.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ONELAB_GROUP_H_
 #define _ONELAB_GROUP_H_
diff --git a/Fltk/openglWindow.cpp b/Fltk/openglWindow.cpp
index 3b704c96904fe3d767114901867a8a2ffdc360d0..f4b22ed4ee1f9c092e3285ff6519b37f30d78ac5 100644
--- a/Fltk/openglWindow.cpp
+++ b/Fltk/openglWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <string.h>
diff --git a/Fltk/openglWindow.h b/Fltk/openglWindow.h
index bc907d34991d2719450f0c340e48e49da08ec6d9..bbcb70581da24139b6a443761752bb23f4f290fb 100644
--- a/Fltk/openglWindow.h
+++ b/Fltk/openglWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OPENGL_WINDOW_H_
 #define _OPENGL_WINDOW_H_
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 95d1333c934e1c0187a0ea4a5c0517046a10c658..4b18405f4c66af33a154e65ae8ac656e4c915ef4 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/optionWindow.h b/Fltk/optionWindow.h
index fc1f3d36c5e9d21c409d1839cffc07ed7694055e..b6eda4318a8aa4fafc29ae13aabdae1fa90808cb 100644
--- a/Fltk/optionWindow.h
+++ b/Fltk/optionWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OPTION_WINDOW_H_
 #define _OPTION_WINDOW_H_
diff --git a/Fltk/outputRange.h b/Fltk/outputRange.h
index 89e7fb558e376c73cfbf3d89c8733a512845d5b2..b2d1010765781740210708bda704046c03934e8c 100644
--- a/Fltk/outputRange.h
+++ b/Fltk/outputRange.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OUTPUT_RANGE_H_
 #define _OUTPUT_RANGE_H_
diff --git a/Fltk/paletteWindow.h b/Fltk/paletteWindow.h
index fc85b1a02253217ff809c334647d6d05099d520d..76f6da93e93c9fa905fbbbc0042d02d5522f74cf 100644
--- a/Fltk/paletteWindow.h
+++ b/Fltk/paletteWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PALETTE_WINDOW_H
 #define _PALETTE_WINDOW_H
diff --git a/Fltk/partitionDialog.cpp b/Fltk/partitionDialog.cpp
index b9955381bc29ad028e8137a8f9b188b62e8d556e..fa6345420df8f8566cb466b45e3a8df428ddbdc5 100644
--- a/Fltk/partitionDialog.cpp
+++ b/Fltk/partitionDialog.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Stephen Guzik
diff --git a/Fltk/partitionDialog.h b/Fltk/partitionDialog.h
index 73fae75397288f7bd4be34068d51a3fc8bec9af7..60d28471a92b303fb92d74edfe87dca4dfa7b67a 100644
--- a/Fltk/partitionDialog.h
+++ b/Fltk/partitionDialog.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTITION_DIALOG_H_
 #define _PARTITION_DIALOG_H_
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 9b29911be5aef55c12c4b12fd8df44814005f43f..910c7d9adfdcede76661066e1ccac16bdededba8 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/pluginWindow.h b/Fltk/pluginWindow.h
index 4a199ded236806066730700fec2eead52778359b..bcd2830a733a4809ba6a4b3d263e08d3d9db38c6 100644
--- a/Fltk/pluginWindow.h
+++ b/Fltk/pluginWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PLUGIN_WINDOW_H_
 #define _PLUGIN_WINDOW_H_
diff --git a/Fltk/projectionEditor.cpp b/Fltk/projectionEditor.cpp
index 258bd1e9003b9aaf002eed140b93e936af2ff941..0354da12ebdd64e93e5e61eec6fc4fb35ebd7023 100644
--- a/Fltk/projectionEditor.cpp
+++ b/Fltk/projectionEditor.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <FL/fl_draw.H>
diff --git a/Fltk/projectionEditor.h b/Fltk/projectionEditor.h
index ee18403cd6d8cd0b62533073eeefdc298d221088..b60518649f96e3658b1130077067f009656ca66f 100644
--- a/Fltk/projectionEditor.h
+++ b/Fltk/projectionEditor.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PROJECTION_EDITOR_H_
 #define _PROJECTION_EDITOR_H_
diff --git a/Fltk/solverButton.cpp b/Fltk/solverButton.cpp
index 47e5a44276f1ff372d6ee75e054d40c7bb873fa2..a24f7559c8ba7bb84dd652750069f505e43357e1 100644
--- a/Fltk/solverButton.cpp
+++ b/Fltk/solverButton.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "FlGui.h"
diff --git a/Fltk/solverButton.h b/Fltk/solverButton.h
index 67822b3f46983556f0dceb45a427982d4829f734..44781ed5b0047e8b703e1b22d76d91b74a3e132e 100644
--- a/Fltk/solverButton.h
+++ b/Fltk/solverButton.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SOLVER_BUTTON_H_
 #define _SOLVER_BUTTON_H_
diff --git a/Fltk/spherePositionWidget.h b/Fltk/spherePositionWidget.h
index 81d5652f11df0f62e8878f46f9c539045276afd7..e6d3294d705435ce52ccf2c28d954c297a0e75a3 100644
--- a/Fltk/spherePositionWidget.h
+++ b/Fltk/spherePositionWidget.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPHERE_POSITION_WIDGET_H_
 #define _SPHERE_POSITION_WIDGET_H_
diff --git a/Fltk/statisticsWindow.cpp b/Fltk/statisticsWindow.cpp
index 948d75ae2fd50a33c374d3bcfcdb49bf109ddf1e..b1f07468d89329a06e15d7dd6f982323d1c03f16 100644
--- a/Fltk/statisticsWindow.cpp
+++ b/Fltk/statisticsWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Box.H>
diff --git a/Fltk/statisticsWindow.h b/Fltk/statisticsWindow.h
index 25493097aa825dae910676f9544ea1bda44c4def..02f5cd22c4198b56c5e42a9393b059f207d024c1 100644
--- a/Fltk/statisticsWindow.h
+++ b/Fltk/statisticsWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _STATISTICS_WINDOW_H_
 #define _STATISTICS_WINDOW_H_
diff --git a/Fltk/treeIcons.h b/Fltk/treeIcons.h
index 7c9ac1cdf59d29e33eb174f59a6e6349f393dbcd..994b70692652b8f9f5627ac8d3963193d303704c 100644
--- a/Fltk/treeIcons.h
+++ b/Fltk/treeIcons.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TREE_ICONS_H_
 #define _TREE_ICONS_H_
diff --git a/Fltk/viewButton.cpp b/Fltk/viewButton.cpp
index 3070ddcb26a434d9ef18e1ab8b98562e8d098ecd..ceb62494e0143490a69dab4885f29eaaf18a11b8 100644
--- a/Fltk/viewButton.cpp
+++ b/Fltk/viewButton.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/fl_ask.H>
 #include "FlGui.h"
diff --git a/Fltk/viewButton.h b/Fltk/viewButton.h
index 54367f353d18f2e4b2870b6b0b7e7710f493b40d..b18d357ca73d4358742d2639003c3020baac90b9 100644
--- a/Fltk/viewButton.h
+++ b/Fltk/viewButton.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _VIEW_BUTTON_H_
 #define _VIEW_BUTTON_H_
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 855ec42720fa7fe70c58d15bf91be48abc6fefc2..2aff31dda8a0195c4e6de55bbf2d7c88176b5413 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/visibilityWindow.h b/Fltk/visibilityWindow.h
index f9ae34e6dd6c8dbdc8739ffa3121a57a62b3dabb..5946ebc75a775091fe77432d8a358ad61e47f9cd 100644
--- a/Fltk/visibilityWindow.h
+++ b/Fltk/visibilityWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _VISIBILITY_WINDOW_H_
 #define _VISIBILITY_WINDOW_H_
diff --git a/FunctionSpace/CMakeLists.txt b/FunctionSpace/CMakeLists.txt
index d7f2859366fee2f169bbef4fbeaf5b7436141bf6..167742fe33d94a38effd649628374203f7950106 100644
--- a/FunctionSpace/CMakeLists.txt
+++ b/FunctionSpace/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Polynomial.cpp
diff --git a/Geo/ACISEdge.cpp b/Geo/ACISEdge.cpp
index d6d40403ce44dd99d6c53950236941903792da52..0c87296e9c364b37ac920aad1755b6b7e074c22d 100644
--- a/Geo/ACISEdge.cpp
+++ b/Geo/ACISEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <limits>
 #include "GmshConfig.h"
diff --git a/Geo/ACISEdge.h b/Geo/ACISEdge.h
index 372cf952d0f9557340c1a0b70c999a8836e0bf47..e27e74bfe15e41bc4df7c52bc10c8479922b9bc2 100644
--- a/Geo/ACISEdge.h
+++ b/Geo/ACISEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ACIS_EDGE_H_
 #define _ACIS_EDGE_H_
diff --git a/Geo/ACISFace.cpp b/Geo/ACISFace.cpp
index 5346160fc96f2f144a41adb55e16c1b628fe33cf..e4402bbfc7a492f56cf9c9b5437bc62e36099288 100644
--- a/Geo/ACISFace.cpp
+++ b/Geo/ACISFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/ACISFace.h b/Geo/ACISFace.h
index 24616d9840e31cf397cc8d5c3cfe5c45938e4c74..55143ae07ac3a93662582d5a877c40551f0eecd0 100644
--- a/Geo/ACISFace.h
+++ b/Geo/ACISFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ACIS_FACE_H_
 #define _ACIS_FACE_H_
diff --git a/Geo/ACISVertex.cpp b/Geo/ACISVertex.cpp
index 58d2439f75e88a5c572ce7eb4934cd79c3da617a..84d0c76083026584a751c80ef39eaac77dcbbeb3 100644
--- a/Geo/ACISVertex.cpp
+++ b/Geo/ACISVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "ACISVertex.h"
 #include "MPoint.h"
diff --git a/Geo/ACISVertex.h b/Geo/ACISVertex.h
index ce76a858cf4740ac736b732b2a4157053d971a7f..3734b2e0c4ee6a715b4b3374b64762190f4f2220 100644
--- a/Geo/ACISVertex.h
+++ b/Geo/ACISVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ACIS_VERTEX_H_
 #define _ACIS_VERTEX_H_
diff --git a/Geo/CGNSOptions.h b/Geo/CGNSOptions.h
index 807f0effcb4834b059d2559a8e9aca4fbb1d3d38..df3b7118b41e72d153647c07b63613d738f7b76c 100644
--- a/Geo/CGNSOptions.h
+++ b/Geo/CGNSOptions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // CGNSOptions.h - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/CMakeLists.txt b/Geo/CMakeLists.txt
index bc89d0de70195215987e331ee5e6ca807c110feb..110c6a8a2a4dbbad0eed9cc912c9d11879a0d2e7 100644
--- a/Geo/CMakeLists.txt
+++ b/Geo/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   boundaryLayersData.cpp
diff --git a/Geo/Cell.cpp b/Geo/Cell.cpp
index d4d80f962756bb6b1b1341129f0b39b1b647962f..fd9b3e894e5dff8f083276a4f7fc69f609ee3aae 100644
--- a/Geo/Cell.cpp
+++ b/Geo/Cell.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Cell.h b/Geo/Cell.h
index 3ea1ddb240b65c0e9e2cde9866db876c3c1e4d2e..f2a66c7829d8e9c8868ddfae0d563b881ef05df5 100644
--- a/Geo/Cell.h
+++ b/Geo/Cell.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/CellComplex.cpp b/Geo/CellComplex.cpp
index fa3ea19b67b2dc05eb65dd1699d1ca8fb5ab5916..95001200b9e0dc51fef3681b9488c7ae9b069dd6 100644
--- a/Geo/CellComplex.cpp
+++ b/Geo/CellComplex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/CellComplex.h b/Geo/CellComplex.h
index fa4b16152c88e01c86c8c0967cecef7462c8586e..76bedfa5eaec41995b1b156a78498d4de06cbee5 100644
--- a/Geo/CellComplex.h
+++ b/Geo/CellComplex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Chain.cpp b/Geo/Chain.cpp
index b92e00d957b42aa6ca76e5b96c229c96e590bed7..5892c6942e9e6c9adceac5c1063401df0223d836 100644
--- a/Geo/Chain.cpp
+++ b/Geo/Chain.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Chain.h b/Geo/Chain.h
index 18bf4b9855711db337eb02814a097ed6138e5d11..06df3709ddb3e3f5b15b1c442ec822342cda291e 100644
--- a/Geo/Chain.h
+++ b/Geo/Chain.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/ChainComplex.cpp b/Geo/ChainComplex.cpp
index 430b58a50fbddec183a75c9af3bbca56bafe9cfd..91e2e6264c64c47e2515b27145e1ad12d0f85edc 100644
--- a/Geo/ChainComplex.cpp
+++ b/Geo/ChainComplex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/ChainComplex.h b/Geo/ChainComplex.h
index 66877a1f484cc53c5e8bca6355f8b4e687bd981f..38b301bc0051bd0d9530ad30e61e47ee5a9f5d6b 100644
--- a/Geo/ChainComplex.h
+++ b/Geo/ChainComplex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Curvature.cpp b/Geo/Curvature.cpp
index 0069f8e2a3d0ff8c9982265caeb709f5678b311a..0c734c84a83ecbe3f0a5b959c5934159a12380cd 100644
--- a/Geo/Curvature.cpp
+++ b/Geo/Curvature.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Curvature.h"
 #include "MElement.h"
diff --git a/Geo/Curvature.h b/Geo/Curvature.h
index 297ec832d3c70ea553d48fd0a4a3b65c3460396f..0dd30d0ca1a41678943921ea60459f954e800b7b 100644
--- a/Geo/Curvature.h
+++ b/Geo/Curvature.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CURVATURE_H_
 #define _CURVATURE_H_
diff --git a/Geo/CustomContainer.h b/Geo/CustomContainer.h
index 1130656f19ae60ac8028d8db24ec43b200a92421..b4e8066f2cf4a5f956473b2129a624eb56138237 100644
--- a/Geo/CustomContainer.h
+++ b/Geo/CustomContainer.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // CustomContainer.h - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/ExtrudeParams.cpp b/Geo/ExtrudeParams.cpp
index 14c054661efbc9baf8c8f226c248a4e5381294c9..7d02f5db066055d97964849648540cd989c89a23 100644
--- a/Geo/ExtrudeParams.cpp
+++ b/Geo/ExtrudeParams.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "Geo.h"
diff --git a/Geo/ExtrudeParams.h b/Geo/ExtrudeParams.h
index c20c5ab822ffcf2eb468445c6cfa832f41c73ac2..ed7e73fbc9c7057254a209650c5c354d4d3542e9 100644
--- a/Geo/ExtrudeParams.h
+++ b/Geo/ExtrudeParams.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EXTRUDE_PARAMS_H_
 #define _EXTRUDE_PARAMS_H_
diff --git a/Geo/GEdge.cpp b/Geo/GEdge.cpp
index 000dedde51ad7f3577594596a248b0e28f3fee7c..e8bd05b0b061f6c825f89008d29b9da10b2e5156 100644
--- a/Geo/GEdge.cpp
+++ b/Geo/GEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <algorithm>
diff --git a/Geo/GEdge.h b/Geo/GEdge.h
index 2923740933890ef47d758ba37c9f408b7d39ed2a..009f4a488fd7c042aec95af9c3ff79bd71b81f99 100644
--- a/Geo/GEdge.h
+++ b/Geo/GEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEDGE_H_
 #define _GEDGE_H_
diff --git a/Geo/GEdgeCompound.cpp b/Geo/GEdgeCompound.cpp
index eca86423291a0e8796e37f791924e709a7a070c0..60df47ebe44e8ce25406ed2986206ab1e52a0edf 100644
--- a/Geo/GEdgeCompound.cpp
+++ b/Geo/GEdgeCompound.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Geo/GEdgeCompound.h b/Geo/GEdgeCompound.h
index af8d3d21b2fd8b96e4c8ed02a5dee9ead277d86d..3efdc13a302dc420b3acd54e7249865bf1bcf3a3 100644
--- a/Geo/GEdgeCompound.h
+++ b/Geo/GEdgeCompound.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEDGE_COMPOUND_H_
 #define _GEDGE_COMPOUND_H_
diff --git a/Geo/GEdgeLoop.cpp b/Geo/GEdgeLoop.cpp
index 3ac2863d36ed98275bb12f1bc2b763dd6bec4b19..de12a51125a3553207f9156fd6cb53021c464713 100644
--- a/Geo/GEdgeLoop.cpp
+++ b/Geo/GEdgeLoop.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include <functional>
diff --git a/Geo/GEdgeLoop.h b/Geo/GEdgeLoop.h
index 1e10d1d2ede0d8840c6cf79ed16512716ad83970..54982ceed2c6de5b9e3fc9c1c0927721ee746d7d 100644
--- a/Geo/GEdgeLoop.h
+++ b/Geo/GEdgeLoop.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEDGE_LOOP_H_
 #define _GEDGE_LOOP_H_
diff --git a/Geo/GEntity.cpp b/Geo/GEntity.cpp
index 6ecd8537eb5e9c0a33349f3d146bac87ff9430ac..fdbcae3f66cb73ed913791f94e77b02f18902ae7 100644
--- a/Geo/GEntity.cpp
+++ b/Geo/GEntity.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include "GModel.h"
diff --git a/Geo/GEntity.h b/Geo/GEntity.h
index 33a7db754236e528ffc4dc0e4e3a54fa0c72b0bc..98cb3703ec01a6100e85e0513f7a316e1a865afe 100644
--- a/Geo/GEntity.h
+++ b/Geo/GEntity.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GENTITY_H_
 #define _GENTITY_H_
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index c1d7041d760606aecb71379eaf1fd82b0469b974..f7230c902fc3fe1eee606e16b475458efb4ea3fe 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include "GmshConfig.h"
diff --git a/Geo/GFace.h b/Geo/GFace.h
index 373ab625f79f3eba63e9f1acdbab3bb325751365..237c5a8366cb7a305b409923fc635c44f2c0479a 100644
--- a/Geo/GFace.h
+++ b/Geo/GFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GFACE_H_
 #define _GFACE_H_
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index d53ed3dc88c02da48cf7c9fe7a8a8abcd12919ae..abf1d2764e87e33fd913620cdd30651536ac4923 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Geo/GFaceCompound.h b/Geo/GFaceCompound.h
index 919a0e388f990bc2814cb6ebbd11d2238f8448a2..fe28e5209830f8b287262f4c71079f5267ddeef7 100644
--- a/Geo/GFaceCompound.h
+++ b/Geo/GFaceCompound.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GFACE_COMPOUND_H_
 #define _GFACE_COMPOUND_H_
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 5311e774214605fa0ce01ccdb104ef7508d64126..c58449c50af3d381158684b65e957e39142f16c2 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <limits>
 #include <stdlib.h>
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 216b816ac7571af53e9fb1fabdd25fb3b58fcba3..e5e43093412365a6bfd81448bf285684cd1a6c56 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODEL_H_
 #define _GMODEL_H_
diff --git a/Geo/GModelFactory.cpp b/Geo/GModelFactory.cpp
index 94e7a2f3ddf0dd6eb3900c320eb3ad20aed0061a..783d716d20c89fb0b9e000059d1553e53ca2b76c 100644
--- a/Geo/GModelFactory.cpp
+++ b/Geo/GModelFactory.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GModelFactory.h"
diff --git a/Geo/GModelFactory.h b/Geo/GModelFactory.h
index e4ecf361c3a3bd11e476b22d97be1a168b2ef586..1aee7a9b3bac537c4f73414ea53d255782ee34c8 100644
--- a/Geo/GModelFactory.h
+++ b/Geo/GModelFactory.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODEL_FACTORY_H_
 #define _GMODEL_FACTORY_H_
diff --git a/Geo/GModelIO_ACIS.cpp b/Geo/GModelIO_ACIS.cpp
index 25c5a31914989e2fba80bf384704e156ad98f8c3..c74ecef76332fe885f2cdc79cf1d6b58341d283a 100644
--- a/Geo/GModelIO_ACIS.cpp
+++ b/Geo/GModelIO_ACIS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GModel.h"
diff --git a/Geo/GModelIO_ACTRAN.cpp b/Geo/GModelIO_ACTRAN.cpp
index 380f6c1cab2e57563ec55d931293ac0e69b860d0..cece167830d2e820c5c79a3ba2be33a0216de250 100644
--- a/Geo/GModelIO_ACTRAN.cpp
+++ b/Geo/GModelIO_ACTRAN.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_BDF.cpp b/Geo/GModelIO_BDF.cpp
index 38e13167fcad385198dc2556e2a69fc5bf851fb3..33f3d658bffe63e82f0b7996bf45b2fb9532080a 100644
--- a/Geo/GModelIO_BDF.cpp
+++ b/Geo/GModelIO_BDF.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_CELUM.cpp b/Geo/GModelIO_CELUM.cpp
index 79783b768959ffbb62db3a37922c76d74777b3ae..499fb121384df84a6d31b3d3f162e2b30581bd45 100644
--- a/Geo/GModelIO_CELUM.cpp
+++ b/Geo/GModelIO_CELUM.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_CGNS.cpp b/Geo/GModelIO_CGNS.cpp
index 896b214652329a2acf0a64e2613bbcc6c8c70291..880fb790bedd9f99a8ee97920a9f39225da71b4a 100644
--- a/Geo/GModelIO_CGNS.cpp
+++ b/Geo/GModelIO_CGNS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // GModelIO_CGNS.cpp - Copyright (C) 2008-2012 S. Guzik, B. Gorissen, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/GModelIO_DIFF.cpp b/Geo/GModelIO_DIFF.cpp
index 6fbed40506a3067241e77ae19a9ee6d012d0997b..c3f4e69af30ede87210357e481a63cca9697b8bc 100644
--- a/Geo/GModelIO_DIFF.cpp
+++ b/Geo/GModelIO_DIFF.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_Fourier.cpp b/Geo/GModelIO_Fourier.cpp
index 658b6a6e3360841ed636d6228caddc7eff6a6d81..11c0763960696b1886672a44152ce00990d9dab1 100644
--- a/Geo/GModelIO_Fourier.cpp
+++ b/Geo/GModelIO_Fourier.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include "GmshConfig.h"
diff --git a/Geo/GModelIO_Fourier.h b/Geo/GModelIO_Fourier.h
index 01d83860d9f0ca33e83a0d6eadff85b435a197b1..70d3df79c3ffad3977a42f9e7be955c26b3e9e8b 100644
--- a/Geo/GModelIO_Fourier.h
+++ b/Geo/GModelIO_Fourier.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODEL_IO_FOURIER_H_
 #define _GMODEL_IO_FOURIER_H_
diff --git a/Geo/GModelIO_GEO.cpp b/Geo/GModelIO_GEO.cpp
index e50ff36bfe807eff162fdd811c19e99c552aef6d..e6f7f9645f1e94a84e34835d5cf025ba3b30a487 100644
--- a/Geo/GModelIO_GEO.cpp
+++ b/Geo/GModelIO_GEO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <stdlib.h>
diff --git a/Geo/GModelIO_GEOM.cpp b/Geo/GModelIO_GEOM.cpp
index d15a4334692d43637be8504c7b71af6b8050c36f..cd5d48759ea34d9d2ad94a00b93a43bbab19e186 100644
--- a/Geo/GModelIO_GEOM.cpp
+++ b/Geo/GModelIO_GEOM.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_INP.cpp b/Geo/GModelIO_INP.cpp
index 6db40d3ecb7351d69885654824655505e148ed3b..b46b64fd5dc2d8ff3b057355aa6b837c55810c51 100644
--- a/Geo/GModelIO_INP.cpp
+++ b/Geo/GModelIO_INP.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_IR3.cpp b/Geo/GModelIO_IR3.cpp
index fa8338f510834e160c215ce0d37bc79e74cb616f..abc96a87948ca620c539b91e375821246e6181da 100644
--- a/Geo/GModelIO_IR3.cpp
+++ b/Geo/GModelIO_IR3.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_MAIL.cpp b/Geo/GModelIO_MAIL.cpp
index 66fff891483fca6ef5f67345a3fee672ece587d5..2d5f95b6d60e24a842efe22c6a4f777258454eb1 100644
--- a/Geo/GModelIO_MAIL.cpp
+++ b/Geo/GModelIO_MAIL.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_MED.cpp b/Geo/GModelIO_MED.cpp
index b00433bd82de23b40a515f12c06f109945377a3e..d580cde4e2abe2d25c49ab2f67a8a01191f8b1e4 100644
--- a/Geo/GModelIO_MED.cpp
+++ b/Geo/GModelIO_MED.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include "GmshConfig.h"
diff --git a/Geo/GModelIO_MESH.cpp b/Geo/GModelIO_MESH.cpp
index e8e5f74878ffb6b276d3d960d9cc6b7e01bd66d8..c0b517d33ee95a1625c9bd7dd73052461749db9a 100644
--- a/Geo/GModelIO_MESH.cpp
+++ b/Geo/GModelIO_MESH.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_MSH.cpp b/Geo/GModelIO_MSH.cpp
index 1c6a7af1deaf3a1e9461c3e9f3a3cf1150eaadcf..34656bf3b09e3b0dd8589fe862c5788f231aa852 100644
--- a/Geo/GModelIO_MSH.cpp
+++ b/Geo/GModelIO_MSH.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <iomanip>
diff --git a/Geo/GModelIO_MSH2.cpp b/Geo/GModelIO_MSH2.cpp
index 3816262af5028c17567ed9d52e3505a0fad629b2..2ea895cd8f2587f98d061572087c54b59fe9ec19 100644
--- a/Geo/GModelIO_MSH2.cpp
+++ b/Geo/GModelIO_MSH2.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp
index d0ce4e50eed9c09d37741ba69d58cdef66381e6e..060e18405e34a0125e1c0a272a91bf46a6f37818 100644
--- a/Geo/GModelIO_OCC.cpp
+++ b/Geo/GModelIO_OCC.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/GModelIO_OCC.h b/Geo/GModelIO_OCC.h
index 72387cd7f60ed7ff6ce42de905b9d3143bb77f7f..000ec2901a920163c24ca23c8cec24111c314772 100644
--- a/Geo/GModelIO_OCC.h
+++ b/Geo/GModelIO_OCC.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODELIO_OCC_H_
 #define _GMODELIO_OCC_H_
diff --git a/Geo/GModelIO_P3D.cpp b/Geo/GModelIO_P3D.cpp
index b7f0ec43deaece501133f19b659f708242c3baa2..352440fbba27b6e0f123a42208f67b0f8e36add4 100644
--- a/Geo/GModelIO_P3D.cpp
+++ b/Geo/GModelIO_P3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_PLY.cpp b/Geo/GModelIO_PLY.cpp
index e3c6a933ecfb1cda0740c540d1f76288fabcddf0..10edd962c9f5d00aa1ad14a53e3c88db037caaf7 100644
--- a/Geo/GModelIO_PLY.cpp
+++ b/Geo/GModelIO_PLY.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_POS.cpp b/Geo/GModelIO_POS.cpp
index f63af6e0368e67881098343796165352c6d5cb5f..9c77c65fbc52a64c84f0800384ba8aeaba7b5e1c 100644
--- a/Geo/GModelIO_POS.cpp
+++ b/Geo/GModelIO_POS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include "GModel.h"
diff --git a/Geo/GModelIO_SGEOM.cpp b/Geo/GModelIO_SGEOM.cpp
index 13c552adc6bb4ccd373ee85e2331627235468030..6fd691dca760dd1f4fcf3373ed4a6b6f8ccbc54d 100644
--- a/Geo/GModelIO_SGEOM.cpp
+++ b/Geo/GModelIO_SGEOM.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/GModelIO_SGEOM.h b/Geo/GModelIO_SGEOM.h
index b2d7fd2a86f2de53f9904ae470c8c23075830ac9..04b17f5d3c0cdddb63d1d88b8ac3bd62c9dfe188 100644
--- a/Geo/GModelIO_SGEOM.h
+++ b/Geo/GModelIO_SGEOM.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODELIO_SGEOM_H_
 #define _GMODELIO_SGEOM_H_
diff --git a/Geo/GModelIO_STL.cpp b/Geo/GModelIO_STL.cpp
index b5d570f8648223843746cb6e46e7c87bd36c8336..a684d6e5dc6237285fe2f3a5e3bd20d3cc3bc02f 100644
--- a/Geo/GModelIO_STL.cpp
+++ b/Geo/GModelIO_STL.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include "GModel.h"
diff --git a/Geo/GModelIO_SU2.cpp b/Geo/GModelIO_SU2.cpp
index e6692cb0930006045b108953b208ca1e62c0dadc..4b2e32363b71a87f0fbe0908840918c5c0c0dfe3 100644
--- a/Geo/GModelIO_SU2.cpp
+++ b/Geo/GModelIO_SU2.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_UNV.cpp b/Geo/GModelIO_UNV.cpp
index bc296563f256170f022292cf50b4454006b7eb05..bff33014dbdd469bb2a564842e266beced96458d 100644
--- a/Geo/GModelIO_UNV.cpp
+++ b/Geo/GModelIO_UNV.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_VRML.cpp b/Geo/GModelIO_VRML.cpp
index 221a5e6e2af77980598cc1f537f2653201bb1ca5..9797885ef82d3689e8a435c205ac7ca829b5909f 100644
--- a/Geo/GModelIO_VRML.cpp
+++ b/Geo/GModelIO_VRML.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_VTK.cpp b/Geo/GModelIO_VTK.cpp
index 11a800a5c6cecfcb5e73febb021b86acd2c60268..98ec063c75948a8ee3eceb43f7014ed355b3ee5a 100644
--- a/Geo/GModelIO_VTK.cpp
+++ b/Geo/GModelIO_VTK.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelVertexArrays.cpp b/Geo/GModelVertexArrays.cpp
index 162b55516033692778d8934341de13bc8db7233d..45ea2b83f6cabb7dd4bf414ebda5a6ebc623122c 100644
--- a/Geo/GModelVertexArrays.cpp
+++ b/Geo/GModelVertexArrays.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GmshMessage.h"
diff --git a/Geo/GPoint.h b/Geo/GPoint.h
index e85d8dfdee90514e1d1c9f1b189acfe68d5ff906..b666bf937ae1e858eea941aae558733c4ce674fd 100644
--- a/Geo/GPoint.h
+++ b/Geo/GPoint.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GPOINT_H_
 #define _GPOINT_H_
diff --git a/Geo/GRbf.cpp b/Geo/GRbf.cpp
index 35587598dfa805922ea48e527790ac51ddd0fe7b..e35d7c05acba5bf4b89cec6b686d5b8818a53fb2 100644
--- a/Geo/GRbf.cpp
+++ b/Geo/GRbf.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Cecile Piret
 
diff --git a/Geo/GRbf.h b/Geo/GRbf.h
index 25a2bbf5e866de778d3656bdd4b64ecaf82c2090..91d3b72ef737121211cd9d5cec0544068b82e2ec 100644
--- a/Geo/GRbf.h
+++ b/Geo/GRbf.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by FIXME
 
diff --git a/Geo/GRegion.cpp b/Geo/GRegion.cpp
index ac20388adfa2278b1c9c91351d66477e838cfbee..1c60c95f92a73016898221f7f1622d006f0433ce 100644
--- a/Geo/GRegion.cpp
+++ b/Geo/GRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include "GModel.h"
diff --git a/Geo/GRegion.h b/Geo/GRegion.h
index 0873819dcc3412509a0ddf273563d64b7f68e1c2..67d69e4db7bde0ddc81dbe2ef381129771efcb10 100644
--- a/Geo/GRegion.h
+++ b/Geo/GRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GREGION_H_
 #define _GREGION_H_
diff --git a/Geo/GRegionCompound.cpp b/Geo/GRegionCompound.cpp
index 9f2cc2f90ab330bf56b4f09d2747882d63793597..4e94616e29c9dc22f075484d6bef501dec56c36d 100644
--- a/Geo/GRegionCompound.cpp
+++ b/Geo/GRegionCompound.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Geo/GRegionCompound.h b/Geo/GRegionCompound.h
index 5fc42ce96e6c268827cf81682c2cbc4e4c613936..793004d60e70b99da04dcd9a43252325d3fc7d0c 100644
--- a/Geo/GRegionCompound.h
+++ b/Geo/GRegionCompound.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GREGION_COMPOUND_H_
 #define _GREGION_COMPOUND_H_
diff --git a/Geo/GVertex.cpp b/Geo/GVertex.cpp
index fb265219da7f1b34f19cecd0ace36d12e6aa4a35..62b96961435ca54c36cfc2a2269b919fe88740fc 100644
--- a/Geo/GVertex.cpp
+++ b/Geo/GVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <algorithm>
diff --git a/Geo/GVertex.h b/Geo/GVertex.h
index 47e30cb8d8a987c3f55efca9e66bcf91b230eb2a..aec7ed0cb2c394d835ae4afe69eaa6ba88b5c181 100644
--- a/Geo/GVertex.h
+++ b/Geo/GVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GVERTEX_H_
 #define _GVERTEX_H_
diff --git a/Geo/GenericEdge.cpp b/Geo/GenericEdge.cpp
index c40ee9b2a61cf4464c79eff40a1fd2d74c2cf13f..76f82dfcff0d3319198adc96f11896375fe17e26 100644
--- a/Geo/GenericEdge.cpp
+++ b/Geo/GenericEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericEdge.h b/Geo/GenericEdge.h
index 0b550b14811da609cc3c514679d03d4151d9d4e9..8c8e5019c337ef0386aa774a01e4d06501bbf873 100644
--- a/Geo/GenericEdge.h
+++ b/Geo/GenericEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericFace.cpp b/Geo/GenericFace.cpp
index 7efbb5fd37db596a7d7435b62e89bcb7ee042aee..2cfe27cb0e2159be1f642dc3ed1e54443c01dd73 100644
--- a/Geo/GenericFace.cpp
+++ b/Geo/GenericFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericFace.h b/Geo/GenericFace.h
index 961a921f7d029aba606568e9746c346710a4e004..12050a98f839f58d2f4024e2634fc2372ac66f79 100644
--- a/Geo/GenericFace.h
+++ b/Geo/GenericFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericRegion.cpp b/Geo/GenericRegion.cpp
index 092e7aa7e25d99306ee3f2fd54dc02e5d4f0ba75..09f49024b63022ea2acf82c1f5dc77327ce0f9d5 100644
--- a/Geo/GenericRegion.cpp
+++ b/Geo/GenericRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericRegion.h b/Geo/GenericRegion.h
index 312854781edc7215d3e4ecb8207a622e9fabd570..399da8738e67b5fab96ca4f85d930d3267ba6896 100644
--- a/Geo/GenericRegion.h
+++ b/Geo/GenericRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericVertex.cpp b/Geo/GenericVertex.cpp
index 3081089aa6228ca3f46fe45851872055d43e111e..f95311fc14cd2cdfd064d897e46eee10c72f3f70 100644
--- a/Geo/GenericVertex.cpp
+++ b/Geo/GenericVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericVertex.h b/Geo/GenericVertex.h
index 2bdcb0b0ad552a4b684234476048740313d99052..f584ba5fd775a7d096899ed73eedef300f673c9a 100644
--- a/Geo/GenericVertex.h
+++ b/Geo/GenericVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index d85971dc0964aeb3641d21a2b9f843e0fc4f1385..ff97645d514d66811bb8bfeb4c8b13bdbc3c8ddc 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/Geo.h b/Geo/Geo.h
index cb5688b38d12560fbe66d7cc28e3398c112a2ff3..97367b003df2124da147156861a960da7bf0ac68 100644
--- a/Geo/Geo.h
+++ b/Geo/Geo.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEO_H_
 #define _GEO_H_
diff --git a/Geo/GeoInterpolation.cpp b/Geo/GeoInterpolation.cpp
index 28806670d8b281f8133dc2c24363197d15bffb23..edd0553a283fa3bc673792e474dec6a87c7adda7 100644
--- a/Geo/GeoInterpolation.cpp
+++ b/Geo/GeoInterpolation.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "Geo.h"
diff --git a/Geo/GeoInterpolation.h b/Geo/GeoInterpolation.h
index 68bd608e06a279ad0a223b32bee4d125878b9c7a..a8bbcc92933582300c2a31a77a094cfce923db2d 100644
--- a/Geo/GeoInterpolation.h
+++ b/Geo/GeoInterpolation.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEO_INTERPOLATION_H_
 #define _GEO_INTERPOLATION_H_
diff --git a/Geo/GeoStringInterface.cpp b/Geo/GeoStringInterface.cpp
index 7deff1940314444ccb976b1ba59843190f0c81ca..ad9529c41c09f02b5c1134621ca67826a7af959d 100644
--- a/Geo/GeoStringInterface.cpp
+++ b/Geo/GeoStringInterface.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <sstream>
diff --git a/Geo/GeoStringInterface.h b/Geo/GeoStringInterface.h
index 50475186c5f5e98229aff36f99eeb21588c2c55a..41256dcfe5191436f87f690df90aa17304e1a0c9 100644
--- a/Geo/GeoStringInterface.h
+++ b/Geo/GeoStringInterface.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEO_STRING_INTERFACE_H_
 #define _GEO_STRING_INTERFACE_H_
diff --git a/Geo/GeomMeshMatcher.cpp b/Geo/GeomMeshMatcher.cpp
index 90afa4ab03b0cefd1e5cb9bfd5655b22f3108fff..4c47805362f476b43898327ad82d6042ea0cfc9e 100644
--- a/Geo/GeomMeshMatcher.cpp
+++ b/Geo/GeomMeshMatcher.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Bastien Gorissen
diff --git a/Geo/GeomMeshMatcher.h b/Geo/GeomMeshMatcher.h
index e53420c1ea3e5478225daf1c4808d69dd16ca097..ed8b2d39ff661e4ba7fb0b1b3b895379282f4bf2 100644
--- a/Geo/GeomMeshMatcher.h
+++ b/Geo/GeomMeshMatcher.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Bastien Gorissen
diff --git a/Geo/Homology.cpp b/Geo/Homology.cpp
index 7a2a0bceb539fb9907525784b8b6bb38f931eaf7..50500eb93c80969ba66dcc0babf27a52ee1796f7 100644
--- a/Geo/Homology.cpp
+++ b/Geo/Homology.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Homology.h b/Geo/Homology.h
index 5f1d78590fb38f3f421a960ffab0ced356b075fe..5649927a1c66d0272b483bf52ed738b6114eaa45 100644
--- a/Geo/Homology.h
+++ b/Geo/Homology.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/MEdge.cpp b/Geo/MEdge.cpp
index 78c9d6f69ad2ee7678c781283d49037bfbfb3cd0..3d57fdfa5f059001d212b304fc740bb05c9b579a 100644
--- a/Geo/MEdge.cpp
+++ b/Geo/MEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "MEdge.h"
diff --git a/Geo/MEdge.h b/Geo/MEdge.h
index 0e29c042df217d98d9488f97201e6f6a1616fdfb..d398080964d412f19b78a166a32c91e2dbc5d34b 100644
--- a/Geo/MEdge.h
+++ b/Geo/MEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MEDGE_H_
 #define _MEDGE_H_
diff --git a/Geo/MEdgeHash.h b/Geo/MEdgeHash.h
index d9d20a4030f60c365f964151f8c5633cc0bbbede..eb61623707df75fa9e0bcb89435a9208f997378d 100644
--- a/Geo/MEdgeHash.h
+++ b/Geo/MEdgeHash.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MEDGE_HASH_H_
 #define _MEDGE_HASH_H_
diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp
index f8501ef1f038a03a7bb60b14daac02ab3e2fb216..4858e5f8f3ef76213f86aa822bf492143c4284a9 100644
--- a/Geo/MElement.cpp
+++ b/Geo/MElement.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <math.h>
diff --git a/Geo/MElement.h b/Geo/MElement.h
index 0d43eed4df7967941ce290ae25672066921bb6c9..fda1ade945ebb1b1e218683571332657ebf71056 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MELEMENT_H_
 #define _MELEMENT_H_
diff --git a/Geo/MElementCut.cpp b/Geo/MElementCut.cpp
index bdd317f83cecf19e5b17ddd265e3d662e2cb1508..47a57c2ddb1a942cea8897970c81f2eac0897094 100644
--- a/Geo/MElementCut.cpp
+++ b/Geo/MElementCut.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Gaetan Bricteux
diff --git a/Geo/MElementCut.h b/Geo/MElementCut.h
index 9b21d213b1301f9642ecd93aa57a7fe4a2a217a9..0d95408201aa4d3ca22c4ebf5b0492c6405999e6 100644
--- a/Geo/MElementCut.h
+++ b/Geo/MElementCut.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Gaetan Bricteux
diff --git a/Geo/MElementOctree.cpp b/Geo/MElementOctree.cpp
index a63e5889be50a71d082cdc0b97f43091c126912a..0b1da70271fe8ef2ffcd1172ab384794dd88f8d8 100644
--- a/Geo/MElementOctree.cpp
+++ b/Geo/MElementOctree.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "MElement.h"
diff --git a/Geo/MElementOctree.h b/Geo/MElementOctree.h
index 4226809a0dc8fd6e12ab5656a85435b7f8ad4710..1fbe12f7e22c46e4ab6f7b140e78d3d99b7f7474 100644
--- a/Geo/MElementOctree.h
+++ b/Geo/MElementOctree.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MELEMENT_OCTREE_
 #define _MELEMENT_OCTREE_
diff --git a/Geo/MFace.cpp b/Geo/MFace.cpp
index d9dd53cb814c48029f1982d0ee317be230e6a68f..526a5c4df36bcf8df44c1afc0dfc9ed97df99d2b 100644
--- a/Geo/MFace.cpp
+++ b/Geo/MFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include <algorithm>
diff --git a/Geo/MFace.h b/Geo/MFace.h
index ecdcd0307aad4a5ad8538835a2183749e09024ab..04e41563a7f56e6e62e003ff5f9ce242bed24d87 100644
--- a/Geo/MFace.h
+++ b/Geo/MFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MFACE_H_
 #define _MFACE_H_
diff --git a/Geo/MFaceHash.h b/Geo/MFaceHash.h
index 85fe828a6578ace5c968bd6ab5efe8928e9a54f1..eb140641a5c3f5fcbbebd2fc3bac1bdcf5da6ced 100644
--- a/Geo/MFaceHash.h
+++ b/Geo/MFaceHash.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MFACE_HASH_H_
 #define _MFACE_HASH_H_
diff --git a/Geo/MHexahedron.cpp b/Geo/MHexahedron.cpp
index 04b881e825febd095eaf54caa8ecd1fa78b2e6cb..ccc3796e99f565ff0b5cb8d50c8d4bd72cfb10b4 100644
--- a/Geo/MHexahedron.cpp
+++ b/Geo/MHexahedron.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 #include <limits>
 #include "MHexahedron.h"
 #include "Numeric.h"
diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h
index fd439ec002aac675b362f4a5360b3335f8fbd5d2..3dda376cad2133225a326ff38cbe8e1088aefe72 100644
--- a/Geo/MHexahedron.h
+++ b/Geo/MHexahedron.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MHEXAHEDRON_H_
 #define _MHEXAHEDRON_H_
diff --git a/Geo/MLine.cpp b/Geo/MLine.cpp
index e7c506581d35443dd199d1d03de84fb059b3a40a..ae11a4428389fb64a915b4efcce7c4efb0dfe440 100644
--- a/Geo/MLine.cpp
+++ b/Geo/MLine.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshDefines.h"
 #include "MLine.h"
diff --git a/Geo/MLine.h b/Geo/MLine.h
index eb78a13eb5e6df87bde9421b6ea40896a9af195f..79d4b5d29d04bc0186e86fa5ab378a0a379bb9e1 100644
--- a/Geo/MLine.h
+++ b/Geo/MLine.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MLINE_H_
 #define _MLINE_H_
diff --git a/Geo/MPoint.h b/Geo/MPoint.h
index 40991dea9808cdde4dcf7139549740cc0dcae977..4e95a2d9aff4eb38ffb70c440bf6f68295e81a9e 100644
--- a/Geo/MPoint.h
+++ b/Geo/MPoint.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MPOINT_H_
 #define _MPOINT_H_
diff --git a/Geo/MPrism.cpp b/Geo/MPrism.cpp
index 6a8d1307b050caec864444b6cf1f7f05e1799cea..3ac5ae27e5dee2c7d766fc580e5fe2cbd4d6140a 100644
--- a/Geo/MPrism.cpp
+++ b/Geo/MPrism.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MPrism.h"
 #include "Numeric.h"
diff --git a/Geo/MPrism.h b/Geo/MPrism.h
index 3cbd0a19b9bb9b42882522d97c98aa89b0bb75e5..844d147176a526fcdb5ee5982d96e1b775ddea52 100644
--- a/Geo/MPrism.h
+++ b/Geo/MPrism.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MPRISM_H_
 #define _MPRISM_H_
diff --git a/Geo/MPyramid.cpp b/Geo/MPyramid.cpp
index 2c6570bef013b2c34c674eb2fc7cb881e0440988..ea27a2a795fc51cd9fb53ce38f089a77df0886b8 100644
--- a/Geo/MPyramid.cpp
+++ b/Geo/MPyramid.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MPyramid.h"
 #include "Numeric.h"
diff --git a/Geo/MPyramid.h b/Geo/MPyramid.h
index 261b61023c8ab4578dae042e0c023ae276dc66d8..85a676b4b78ce13b3f35d3c22c7c45a98f971be6 100644
--- a/Geo/MPyramid.h
+++ b/Geo/MPyramid.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MPYRAMID_H_
 #define _MPYRAMID_H_
diff --git a/Geo/MQuadrangle.cpp b/Geo/MQuadrangle.cpp
index 37b55e4ef4f6a8d7e2aab917f3a13bd6251ed0b7..468fd5306d75ab5a37f7e686ca6ed46b21894230 100644
--- a/Geo/MQuadrangle.cpp
+++ b/Geo/MQuadrangle.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "MQuadrangle.h"
diff --git a/Geo/MQuadrangle.h b/Geo/MQuadrangle.h
index 7b84e42bbb294bc3b05ed9d5c8d61f336f8c4295..252507b48585cc2925156b4414cfb442d12e1e1f 100644
--- a/Geo/MQuadrangle.h
+++ b/Geo/MQuadrangle.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MQUADRANGLE_H_
 #define _MQUADRANGLE_H_
diff --git a/Geo/MSubElement.cpp b/Geo/MSubElement.cpp
index 02b3d91cee63741c16c10faf45515c7e5af945db..737251e3718488f4661eb1be841ecaa9250f318e 100644
--- a/Geo/MSubElement.cpp
+++ b/Geo/MSubElement.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Frederic Duboeuf
diff --git a/Geo/MSubElement.h b/Geo/MSubElement.h
index d161fd9e9c818ee5712e69c3b0c7d32469bad074..f54dae3f37aab01cf1bdc9de1c1f6e0f9b2398d6 100644
--- a/Geo/MSubElement.h
+++ b/Geo/MSubElement.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Frederic Duboeuf
diff --git a/Geo/MTetrahedron.cpp b/Geo/MTetrahedron.cpp
index ee068aba043b9299379aaef71ac3eedfe18a3f59..9bda9f6b5d1c47673e416e3f08926731252969b3 100644
--- a/Geo/MTetrahedron.cpp
+++ b/Geo/MTetrahedron.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "MTetrahedron.h"
diff --git a/Geo/MTetrahedron.h b/Geo/MTetrahedron.h
index 0cc9a5e5c55f464e62351a7897d5eae8bde1420e..d9ce0ada0583e16f6e472faf41229048f1f76b68 100644
--- a/Geo/MTetrahedron.h
+++ b/Geo/MTetrahedron.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MTETRAHEDRON_H_
 #define _MTETRAHEDRON_H_
diff --git a/Geo/MTriangle.cpp b/Geo/MTriangle.cpp
index d00557a77d17943663d8821e719801ad4c9327f3..90ebc5d228c4f93f4d2a99f1e4ae2a37d66032d7 100644
--- a/Geo/MTriangle.cpp
+++ b/Geo/MTriangle.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "MTriangle.h"
diff --git a/Geo/MTriangle.h b/Geo/MTriangle.h
index 74bde4741afbe203266db0f56793f3a89cbacb4d..3bafc78c3a7323b4722252dd961b9fde29636b0e 100644
--- a/Geo/MTriangle.h
+++ b/Geo/MTriangle.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MTRIANGLE_H_
 #define _MTRIANGLE_H_
diff --git a/Geo/MVertex.cpp b/Geo/MVertex.cpp
index cf494177900b5f1804441a50d5ba319dd3694848..cc64b66fd395ed526ff9680a40091b0f85255c8e 100644
--- a/Geo/MVertex.cpp
+++ b/Geo/MVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <math.h>
diff --git a/Geo/MVertex.h b/Geo/MVertex.h
index c1bc009d03959e9e5855892f41ceadfb9fe28db7..8445ff54810c0a24fc8b3684a63516f7e8803bbc 100644
--- a/Geo/MVertex.h
+++ b/Geo/MVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MVERTEX_H_
 #define _MVERTEX_H_
diff --git a/Geo/MVertexBoundaryLayerData.cpp b/Geo/MVertexBoundaryLayerData.cpp
index db5c6bd66f61af151b48baa98700788529337bc6..ff68793bf64b3ae21edc5fd014e89c42bdc848cf 100644
--- a/Geo/MVertexBoundaryLayerData.cpp
+++ b/Geo/MVertexBoundaryLayerData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MVertexBoundaryLayerData.h"
 
diff --git a/Geo/MVertexBoundaryLayerData.h b/Geo/MVertexBoundaryLayerData.h
index 9a8461a2e9eaf09d4d0a799b0ea99ba03e15808b..2857d5015010c5ffa19c58dac81ca4051891b084 100644
--- a/Geo/MVertexBoundaryLayerData.h
+++ b/Geo/MVertexBoundaryLayerData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MVERTEXBOUNDARYLAYERDATA_H_
 #define _MVERTEXBOUNDARYLAYERDATA_H_
diff --git a/Geo/MVertexRTree.h b/Geo/MVertexRTree.h
index 1074343767de6da516ca1f4001e76ea61f7bd6d0..166eef90cb02ab9477df5caa0edcde5e7bd461a6 100644
--- a/Geo/MVertexRTree.h
+++ b/Geo/MVertexRTree.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MVERTEX_RTREE_
 #define _MVERTEX_RTREE_
diff --git a/Geo/MZone.cpp b/Geo/MZone.cpp
index 480d4253067ae295dc68432733b773ffaea9a6be..d89b3a9ae20d7e6b86b0aced64ab1c4a64c92ab3 100644
--- a/Geo/MZone.cpp
+++ b/Geo/MZone.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // MZone.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/MZone.h b/Geo/MZone.h
index 167cedcda940c19104743ac840155541ab3791e9..5fa80d28f7ad62289bf772633caefcfe7f1963cf 100644
--- a/Geo/MZone.h
+++ b/Geo/MZone.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // MZone.h - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/MZoneBoundary.cpp b/Geo/MZoneBoundary.cpp
index ae4e7c71a67e734e2e3c4dd9ec81c2b0785bca26..8899b247aa5e33077da0e18c83be28fc94985081 100644
--- a/Geo/MZoneBoundary.cpp
+++ b/Geo/MZoneBoundary.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // MZoneBoundary.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/MZoneBoundary.h b/Geo/MZoneBoundary.h
index 67b1a9a2c834d2be67902a6eab97dcc0e5def1ed..02480ec3da41e6ee674522e97ace76b676bfc658 100644
--- a/Geo/MZoneBoundary.h
+++ b/Geo/MZoneBoundary.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // MZoneBoundary.h - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/OCCEdge.cpp b/Geo/OCCEdge.cpp
index 7b21674b46454eeece039894e9039a845904bb2f..85f1baf2a07b891f566eec9ff0f9934a19618e18 100644
--- a/Geo/OCCEdge.cpp
+++ b/Geo/OCCEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <limits>
 #include "GmshConfig.h"
diff --git a/Geo/OCCEdge.h b/Geo/OCCEdge.h
index 5dbd3e67495d3b00c2c87a839535e74a06424e8c..9d4fe1182d64ac9663f4ab5c97f3f8ab7bd09627 100644
--- a/Geo/OCCEdge.h
+++ b/Geo/OCCEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_EDGE_H_
 #define _OCC_EDGE_H_
diff --git a/Geo/OCCFace.cpp b/Geo/OCCFace.cpp
index d8baf1a24f79f75d5a5720b68f500566c32869a5..048f697be6656407a7bd0d9193048cc0300e1365 100644
--- a/Geo/OCCFace.cpp
+++ b/Geo/OCCFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/OCCFace.h b/Geo/OCCFace.h
index 93a96a493cde4467bc6584cdbf7dc8015350dda9..3f36630e75af4a7202ae48fe4411f67dcfafc18a 100644
--- a/Geo/OCCFace.h
+++ b/Geo/OCCFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_FACE_H_
 #define _OCC_FACE_H_
diff --git a/Geo/OCCIncludes.h b/Geo/OCCIncludes.h
index f300ad9c3f20220c349c50c29a154d5d822741b3..81114bae6ed61095bcf1db05593558d751cbff4c 100644
--- a/Geo/OCCIncludes.h
+++ b/Geo/OCCIncludes.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_INCLUDES_
 #define _OCC_INCLUDES_
diff --git a/Geo/OCCRegion.cpp b/Geo/OCCRegion.cpp
index efe47a1b9d2569a0f4945067b4d75a4b43869f95..b038019dc8bb4ab93a7ac5dff4c33a857b15def3 100644
--- a/Geo/OCCRegion.cpp
+++ b/Geo/OCCRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/OCCRegion.h b/Geo/OCCRegion.h
index 29d6e5b9c5375febb3a30745675e7ce8e63394a7..61be8e8a85d18f99b98ffb77f95e322f4f95181e 100644
--- a/Geo/OCCRegion.h
+++ b/Geo/OCCRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_REGION_H_
 #define _OCC_REGION_H_
diff --git a/Geo/OCCVertex.cpp b/Geo/OCCVertex.cpp
index b882a46020856e73cc07ab7db68ac1164f8fef93..42e3b8644d2208d67a95609b2325a6fe23540f43 100644
--- a/Geo/OCCVertex.cpp
+++ b/Geo/OCCVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GModel.h"
diff --git a/Geo/OCCVertex.h b/Geo/OCCVertex.h
index bd3ff321fcc75e8f5f0f8a22b5cde1cb13c59ff7..8fbba61668d1ed38741d07be057137a913aafefc 100644
--- a/Geo/OCCVertex.h
+++ b/Geo/OCCVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_VERTEX_H_
 #define _OCC_VERTEX_H_
diff --git a/Geo/OCC_Connect.cpp b/Geo/OCC_Connect.cpp
index 6c7720fc371660e6fb2fbf24b470306a95d5b873..a1ac9a30c990bd46d5f9bb9983ac9c9c1b62beee 100644
--- a/Geo/OCC_Connect.cpp
+++ b/Geo/OCC_Connect.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Mark van Doesburg, Technolution B.V.
 
diff --git a/Geo/OCC_Connect.h b/Geo/OCC_Connect.h
index 9c954f24c3c35ca026635783788df1ed3d99647a..dfccdd467c65422fe3425b530a1b40c379b69a37 100644
--- a/Geo/OCC_Connect.h
+++ b/Geo/OCC_Connect.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Mark van Doesburg, Technolution B.V.
 
diff --git a/Geo/Pair.h b/Geo/Pair.h
index e45a6d8bb16049de60103ca61d13948cfa05df18..cd9ec99618b6ce6658b7596594de0e501b951b57 100644
--- a/Geo/Pair.h
+++ b/Geo/Pair.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PAIR_H_
 #define _PAIR_H_
diff --git a/Geo/Range.h b/Geo/Range.h
index 9920432a79cb4d85f53511bc2c6ea0fc8008f29e..a4088f442f73a4aae2508ac5edb1a094591fd1cf 100644
--- a/Geo/Range.h
+++ b/Geo/Range.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _RANGE_H_
 #define _RANGE_H_
diff --git a/Geo/SBoundingBox3d.h b/Geo/SBoundingBox3d.h
index b3b40251b4845e72d8fd2d80bb7113397af189d9..3565f0c9764ff65b29d332e8462dd0bed4db9bc3 100644
--- a/Geo/SBoundingBox3d.h
+++ b/Geo/SBoundingBox3d.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SBOUNDING_BOX_3D_H_
 #define _SBOUNDING_BOX_3D_H_
diff --git a/Geo/SGEOMIncludes.h b/Geo/SGEOMIncludes.h
index adcaf57551a33c8ec393d6fae1f17e8a96fd4b23..fa13fa2bfb3eb3f56127a818ae3fb925500df0a1 100644
--- a/Geo/SGEOMIncludes.h
+++ b/Geo/SGEOMIncludes.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SGEOM_INCLUDES_
 #define _SGEOM_INCLUDES_
diff --git a/Geo/SOrientedBoundingBox.cpp b/Geo/SOrientedBoundingBox.cpp
index 95d022d78b01c6e44e5288cac9fe655c4e6a6228..0eb2ccaed675fdae87180e3294a3496b2a3f6d14 100644
--- a/Geo/SOrientedBoundingBox.cpp
+++ b/Geo/SOrientedBoundingBox.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Bastien Gorissen
diff --git a/Geo/SOrientedBoundingBox.h b/Geo/SOrientedBoundingBox.h
index 547353a582f60f51a49b1235df7962849c44f798..dc02c000a27eebc56b4da7e0f285e2c6226d13bd 100644
--- a/Geo/SOrientedBoundingBox.h
+++ b/Geo/SOrientedBoundingBox.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Bastien Gorissen
diff --git a/Geo/SPoint2.h b/Geo/SPoint2.h
index 2588ade1fb7558455a79a6773ffaf389a6c189d8..5c4f4d685848dbad1dad56ca98590338d04f8509 100644
--- a/Geo/SPoint2.h
+++ b/Geo/SPoint2.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPOINT2_H_
 #define _SPOINT2_H_
diff --git a/Geo/SPoint3.h b/Geo/SPoint3.h
index 3545fc8d22efe91418a26c8ba5f41a5e0f530fb9..ea44797c98650e8d431e3353865b3805a7a3d2a2 100644
--- a/Geo/SPoint3.h
+++ b/Geo/SPoint3.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPOINT3_H_
 #define _SPOINT3_H_
diff --git a/Geo/STensor3.cpp b/Geo/STensor3.cpp
index 8d22139ee2f7ac3fb3bc3dce50f9056c905930a1..12c242fd0ae35de429c42efc965ad5abaa2e350e 100644
--- a/Geo/STensor3.cpp
+++ b/Geo/STensor3.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "STensor3.h"
diff --git a/Geo/STensor3.h b/Geo/STensor3.h
index b3a56a3b0677f055bb7b5282e9d9abd122c78255..1a20b273b5615eeb71f9961ea72292f43c9549c1 100644
--- a/Geo/STensor3.h
+++ b/Geo/STensor3.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _STENSOR3_H_
 #define _STENSOR3_H_
diff --git a/Geo/SVector3.h b/Geo/SVector3.h
index 7ba4e798a3e3b820acfbdfa38f08f2ea2c75fde1..96e796a3298e645cca237ba4aecf16f7edab2b3a 100644
--- a/Geo/SVector3.h
+++ b/Geo/SVector3.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SVECTOR3_H_
 #define _SVECTOR3_H_
diff --git a/Geo/boundaryLayersData.cpp b/Geo/boundaryLayersData.cpp
index e7bd3228a94f9d69abd3565eac0e70ad75fbc33a..6886eff5d44d35131ea15a0f77dfe159a9cb1833 100644
--- a/Geo/boundaryLayersData.cpp
+++ b/Geo/boundaryLayersData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stack>
 #include "GmshConfig.h"
diff --git a/Geo/boundaryLayersData.h b/Geo/boundaryLayersData.h
index 846aca32ba837c554676bb5814e3c52c54633590..419dba893a6bf644f0b64c4dd3a45fe885d4bfc4 100644
--- a/Geo/boundaryLayersData.h
+++ b/Geo/boundaryLayersData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BNDRYLRDATA_
 #define _BNDRYLRDATA_
diff --git a/Geo/closestPoint.cpp b/Geo/closestPoint.cpp
index ddee5e1d34dbdf006471204182ad4e5e8e006cb1..94bd921b18fb70f4b15f53620034969333179f25 100644
--- a/Geo/closestPoint.cpp
+++ b/Geo/closestPoint.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "closestPoint.h"
 #include "GEntity.h"
diff --git a/Geo/closestPoint.h b/Geo/closestPoint.h
index 10ac4305d9706f03230404babea970d728e101d2..4fba49e9ac5f4089780444480c41dc5bc98b0239 100644
--- a/Geo/closestPoint.h
+++ b/Geo/closestPoint.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CLOSEST_POINT_H_
 #define _CLOSEST_POINT_H_
diff --git a/Geo/discreteEdge.cpp b/Geo/discreteEdge.cpp
index 8aa77bfa95c9be6936edf3c8137afbf60d0cec30..4b5cc2652a70b97b2b2a3500b16bb1a8dc7a6539 100644
--- a/Geo/discreteEdge.cpp
+++ b/Geo/discreteEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include <list>
diff --git a/Geo/discreteEdge.h b/Geo/discreteEdge.h
index d21d4041cdcf99e964fa17f0a7e5204056a2e625..0d80563c3a014240bbc1853844161a5011fb28a9 100644
--- a/Geo/discreteEdge.h
+++ b/Geo/discreteEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_EDGE_H_
 #define _DISCRETE_EDGE_H_
diff --git a/Geo/discreteFace.cpp b/Geo/discreteFace.cpp
index 29df07cbbf154c07c3aaa8e99621bb33f51d9597..5e4ed1ce14ace9559132cf2fc10b94504d00cbb8 100644
--- a/Geo/discreteFace.cpp
+++ b/Geo/discreteFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GmshConfig.h"
diff --git a/Geo/discreteFace.h b/Geo/discreteFace.h
index 1368b42654b942637d625ad77c5b27e60d678cc6..6a978be2ce46b6406ef3b4d4feb913671a688370 100644
--- a/Geo/discreteFace.h
+++ b/Geo/discreteFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_FACE_H_
 #define _DISCRETE_FACE_H_
diff --git a/Geo/discreteRegion.cpp b/Geo/discreteRegion.cpp
index a67577fbf92588105497f2018b404bc3bf49283e..5a27ec58274f8e16153699916aa5a0879eaf641b 100644
--- a/Geo/discreteRegion.cpp
+++ b/Geo/discreteRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "discreteRegion.h"
diff --git a/Geo/discreteRegion.h b/Geo/discreteRegion.h
index 60f1f0ca77927f85b5665b2d39b86b6706c7e464..7d8c58bbae2bba15990f8ed844b07c47bbe5d327 100644
--- a/Geo/discreteRegion.h
+++ b/Geo/discreteRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_REGION_H_
 #define _DISCRETE_REGION_H_
diff --git a/Geo/discreteVertex.h b/Geo/discreteVertex.h
index 7087a144186f58939a5700c70bccf8e858b03b50..cd33b4fc46d034245517a1dfe0fd0f3a5dadb2b9 100644
--- a/Geo/discreteVertex.h
+++ b/Geo/discreteVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_VERTEX_H_
 #define _DISCRETE_VERTEX_H_
diff --git a/Geo/findLinks.cpp b/Geo/findLinks.cpp
index 172e7fd6f5b29de76f835e2dfe34a5237ed76797..0f952add8635ee31ab9f453c2c531fca65a64553 100644
--- a/Geo/findLinks.cpp
+++ b/Geo/findLinks.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GmshMessage.h"
diff --git a/Geo/findLinks.h b/Geo/findLinks.h
index 37b4587e659831a080734d78826426ce567b7cb6..e0d6bafc77503130d6dc849057ecb95edc4f0291 100644
--- a/Geo/findLinks.h
+++ b/Geo/findLinks.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIND_LINKS_H_
 #define _FIND_LINKS_H_
diff --git a/Geo/fourierEdge.cpp b/Geo/fourierEdge.cpp
index 26a919a8627e8241c57cbc5689df78848672d546..ac2ce7f50148e6dfb5b069c3d071a46deb949407 100644
--- a/Geo/fourierEdge.cpp
+++ b/Geo/fourierEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "fourierEdge.h"
diff --git a/Geo/fourierEdge.h b/Geo/fourierEdge.h
index 68ae00f7782d23eeca244813e584041df12e6f12..73a528e5fdc481fec3145f6a7dc9cc65e7b7971e 100644
--- a/Geo/fourierEdge.h
+++ b/Geo/fourierEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FOURIER_EDGE_H_
 #define _FOURIER_EDGE_H_
diff --git a/Geo/fourierFace.cpp b/Geo/fourierFace.cpp
index 98e158ae84fd98f911e359ff128f77fd14219f8b..daa4e3657e1d0c934bd98287d639cf5b34ad3acd 100644
--- a/Geo/fourierFace.cpp
+++ b/Geo/fourierFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <list>
 #include "GmshConfig.h"
diff --git a/Geo/fourierFace.h b/Geo/fourierFace.h
index 7e2a93b69566588e55cb1099846f7748f78c142d..5643a95a39a6dd093b9ed9d94b14ad76cd558097 100644
--- a/Geo/fourierFace.h
+++ b/Geo/fourierFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FOURIER_FACE_H_
 #define _FOURIER_FACE_H_
diff --git a/Geo/fourierProjectionFace.cpp b/Geo/fourierProjectionFace.cpp
index 91daecbf4731160e0ebe68aa8f660e17475646df..7452b0f5d43af6e6243e298fa26514190b57c394 100644
--- a/Geo/fourierProjectionFace.cpp
+++ b/Geo/fourierProjectionFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/fourierProjectionFace.h b/Geo/fourierProjectionFace.h
index f127b0789390f3cf39920bec23693176cbf3aea3..0a11a207eea54db1e8d23188202dfc06e6c4a975 100644
--- a/Geo/fourierProjectionFace.h
+++ b/Geo/fourierProjectionFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FOURIER_PROJECTION_FACE_H_
 #define _FOURIER_PROJECTION_FACE_H_
diff --git a/Geo/fourierVertex.h b/Geo/fourierVertex.h
index f0fcb0d0aeb0ec9375ccf0f4ea4f494aa98d4c7b..33466fc8e0722f5c81ecf3641fe78422a3f38af1 100644
--- a/Geo/fourierVertex.h
+++ b/Geo/fourierVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FOURIER_VERTEX_H_
 #define _FOURIER_VERTEX_H_
diff --git a/Geo/gmshEdge.cpp b/Geo/gmshEdge.cpp
index ff1fa465d9652e24b430ee814938f98453da2f12..3e3263e7bc99d8ab3c32e15ac848de7e7265ceb1 100644
--- a/Geo/gmshEdge.cpp
+++ b/Geo/gmshEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include "GModel.h"
diff --git a/Geo/gmshEdge.h b/Geo/gmshEdge.h
index 09b94106e6916a221ce533c8c3d205d3796602cd..89b9be5d01585f90e597056139237d7b2aacb0f9 100644
--- a/Geo/gmshEdge.h
+++ b/Geo/gmshEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_EDGE_H_
 #define _GMSH_EDGE_H_
diff --git a/Geo/gmshEdgeDiscretize.cpp b/Geo/gmshEdgeDiscretize.cpp
index 7fc51e59ec528cd39b50a743f599012afe1201a3..20e13333f6b3cb4670454de3da2a3dcf3a248c56 100644
--- a/Geo/gmshEdgeDiscretize.cpp
+++ b/Geo/gmshEdgeDiscretize.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <cstdio>
 #include <cmath>
diff --git a/Geo/gmshFace.cpp b/Geo/gmshFace.cpp
index b960952a1828773622364dd713fb3521b18ec06d..38f6e58345ca736fe7f9f692bf90e33d068c5e60 100644
--- a/Geo/gmshFace.cpp
+++ b/Geo/gmshFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GModel.h"
diff --git a/Geo/gmshFace.h b/Geo/gmshFace.h
index 71da5e5a180b92c4bc8284e0683804474e1055b3..faf9397dc7686e2a1e799240a25a71df75953ee2 100644
--- a/Geo/gmshFace.h
+++ b/Geo/gmshFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_FACE_H_
 #define _GMSH_FACE_H_
diff --git a/Geo/gmshLevelset.cpp b/Geo/gmshLevelset.cpp
index e28ebeceaa79f15c94b8d7e674ae652682fc2b75..5fb9ae71e52786d5cfb4402e0f00b088ed128cd4 100644
--- a/Geo/gmshLevelset.cpp
+++ b/Geo/gmshLevelset.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Gaetan Bricteux
diff --git a/Geo/gmshLevelset.h b/Geo/gmshLevelset.h
index ff8889b10e687ba39644f2b9703b35849722f262..257c00ab8c262a4c701bc4e7036d157b9c23db10 100644
--- a/Geo/gmshLevelset.h
+++ b/Geo/gmshLevelset.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Gaetan Bricteux
diff --git a/Geo/gmshRegion.cpp b/Geo/gmshRegion.cpp
index fd2dfb846e623a72f57f01ec1c109d5aa7b25d14..7c31177df40741087696bf60f2a9532501f0aa1a 100644
--- a/Geo/gmshRegion.cpp
+++ b/Geo/gmshRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GModel.h"
diff --git a/Geo/gmshRegion.h b/Geo/gmshRegion.h
index 6dea600f50e1d595e82389e4d50ec32a718ebeca..c09adc6a14d5348168275c3f3cbde178ed2f6f39 100644
--- a/Geo/gmshRegion.h
+++ b/Geo/gmshRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_REGION_H_
 #define _GMSH_REGION_H_
diff --git a/Geo/gmshSurface.cpp b/Geo/gmshSurface.cpp
index f5893b66712d55901d76dc445ca31f35b56e1f91..851c1ff270538302413bbc36789c4ee9ca527573 100644
--- a/Geo/gmshSurface.cpp
+++ b/Geo/gmshSurface.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/gmshSurface.h b/Geo/gmshSurface.h
index b7b104098665beff821d99048a729f87a03206b5..c5708a76419912d29d868c21a682e05028a92144 100644
--- a/Geo/gmshSurface.h
+++ b/Geo/gmshSurface.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_SURFACE_H_
 #define _GMSH_SURFACE_H_
diff --git a/Geo/gmshVertex.cpp b/Geo/gmshVertex.cpp
index 686017a4442f6b43494a764bb91e808ea49aeb45..4384512511c7153dc34861b3e99cda34749f996d 100644
--- a/Geo/gmshVertex.cpp
+++ b/Geo/gmshVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GFace.h"
 #include "GEdge.h"
diff --git a/Geo/gmshVertex.h b/Geo/gmshVertex.h
index 72725b8cdee7f8ab91f603c63a50e335bf4cc4b3..75e11a5d1c439e7b357632213aba20fdb7bdc035 100644
--- a/Geo/gmshVertex.h
+++ b/Geo/gmshVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_VERTEX_H_
 #define _GMSH_VERTEX_H_
diff --git a/Geo/intersectCurveSurface.cpp b/Geo/intersectCurveSurface.cpp
index eebbece38f8af20433ca37c64a07f6c1762bd6ed..6e86a45bb909c32cb4ab4a71b40114dbc73123af 100644
--- a/Geo/intersectCurveSurface.cpp
+++ b/Geo/intersectCurveSurface.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "intersectCurveSurface.h"
 #include "Numeric.h"
diff --git a/Geo/intersectCurveSurface.h b/Geo/intersectCurveSurface.h
index 2edc08d1cd81e573f67322d1b22fc36b99656f03..a4e8dbcca6a3f1841e626425b64e86e6aa9f10db 100644
--- a/Geo/intersectCurveSurface.h
+++ b/Geo/intersectCurveSurface.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INTERSECT_CURVE_SURFACE_
 #define _INTERSECT_CURVE_SURFACE_
diff --git a/Geo/partitionEdge.h b/Geo/partitionEdge.h
index c68ee5b554a882c74d8b9afc8428295864b403e7..cbabfaf1b4222141bf3f7f997110498f226a80fc 100644
--- a/Geo/partitionEdge.h
+++ b/Geo/partitionEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTITION_EDGE_H_
 #define _PARTITION_EDGE_H_
diff --git a/Geo/partitionFace.h b/Geo/partitionFace.h
index 2fdbe1eb07b6e601c113b517a34abc21bbcc97c0..87b6d66e7849eb9a5100f73e5f476c0c62b953d4 100644
--- a/Geo/partitionFace.h
+++ b/Geo/partitionFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTITION_FACE_H_
 #define _PARTITION_FACE_H_
diff --git a/Geo/partitionVertex.h b/Geo/partitionVertex.h
index 8bb9e3a1684b331ede856ba097d1f416fdcf40ff..0fa6f291dd23391cbccfaa61c8b016f3343effe4 100644
--- a/Geo/partitionVertex.h
+++ b/Geo/partitionVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTITION_VERTEX_H_
 #define _PARTITION_VERTEX_H_
diff --git a/Graphics/CMakeLists.txt b/Graphics/CMakeLists.txt
index 667343da0a5f1c1a10b9bc0b7300291ae2e84b26..be25be1872043fd6503febef19166edd426e6ddb 100644
--- a/Graphics/CMakeLists.txt
+++ b/Graphics/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Camera.cpp 
diff --git a/Graphics/Camera.cpp b/Graphics/Camera.cpp
index 1c6c80d54029dfbad1370d432c849a25867e590f..a5a82ac4e00248d765dc90dcd8f7c9b71cbacde6 100644
--- a/Graphics/Camera.cpp
+++ b/Graphics/Camera.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 
diff --git a/Graphics/Camera.h b/Graphics/Camera.h
index 6f64b87b3bb05a656057657115ef8e4527f23f59..c35b004eb6224c23d926ccfbf318167387b5221b 100644
--- a/Graphics/Camera.h
+++ b/Graphics/Camera.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 
diff --git a/Graphics/PixelBuffer.h b/Graphics/PixelBuffer.h
index 227f54d6c494e72c321e2d98c4175af2b8bea331..90c179bcee16f9e0b0e49ccad8dddee8688bdd9e 100644
--- a/Graphics/PixelBuffer.h
+++ b/Graphics/PixelBuffer.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PIXEL_BUFFER_H_
 #define _PIXEL_BUFFER_H_
diff --git a/Graphics/ReadImg.cpp b/Graphics/ReadImg.cpp
index 7cdc3bc15b4401d71036cc636f8d717be3a5f538..731875a5143e1fd3f82bb5797c842952ce0f5126 100644
--- a/Graphics/ReadImg.cpp
+++ b/Graphics/ReadImg.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "ReadImg.h"
diff --git a/Graphics/ReadImg.h b/Graphics/ReadImg.h
index 6b2c93bf109d8c36f9c52edc49257e22898d3780..37f17d2143fe08f3edf25faddad311cb5ca174af 100644
--- a/Graphics/ReadImg.h
+++ b/Graphics/ReadImg.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _READ_IMG_
 #define _READ_IMG_
diff --git a/Graphics/drawAxes.cpp b/Graphics/drawAxes.cpp
index 4e42623c1624a6a4f7f59a4d5565a6787264dd8e..ccbad7ba212ea189b2ec8cca94d4ed92be7b2898 100644
--- a/Graphics/drawAxes.cpp
+++ b/Graphics/drawAxes.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <iostream>
diff --git a/Graphics/drawContext.cpp b/Graphics/drawContext.cpp
index 02ff5dfe0647b131f2accf6b02a8692266bed25b..b8b051a476c5579edcb3f7dd399d140e0651624b 100644
--- a/Graphics/drawContext.cpp
+++ b/Graphics/drawContext.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <stdio.h>
diff --git a/Graphics/drawContext.h b/Graphics/drawContext.h
index 870e2d7282249c84cf6c9cb9f77a3236f5cde40c..35ca6cde7e72013bba59b4a3ca634926770bc475 100644
--- a/Graphics/drawContext.h
+++ b/Graphics/drawContext.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DRAW_CONTEXT_H_
 #define _DRAW_CONTEXT_H_
diff --git a/Graphics/drawGeom.cpp b/Graphics/drawGeom.cpp
index d99b2addb404a516edce3ecaf5864b2b70f49231..dc5081a0277a911766f936782ff0ad7c4926738e 100644
--- a/Graphics/drawGeom.cpp
+++ b/Graphics/drawGeom.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "drawContext.h"
diff --git a/Graphics/drawGlyph.cpp b/Graphics/drawGlyph.cpp
index c2cc4f769f10582147737938c4b723811b8b86d4..a748158b2994dfddf06c7255dff4fc647e5659f7 100644
--- a/Graphics/drawGlyph.cpp
+++ b/Graphics/drawGlyph.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "drawContext.h"
diff --git a/Graphics/drawGraph2d.cpp b/Graphics/drawGraph2d.cpp
index 181d344dd95c6c4106fdfdee3393a41b98654b1c..d6ebb6055130dca899067e120b3ccce017c30d8a 100644
--- a/Graphics/drawGraph2d.cpp
+++ b/Graphics/drawGraph2d.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "drawContext.h"
diff --git a/Graphics/drawMesh.cpp b/Graphics/drawMesh.cpp
index f0d9dfe1cf21b14c669df9fe877e31de24dd5bf0..7544c357bd523ae7458ea9e64fb704847d1d292c 100644
--- a/Graphics/drawMesh.cpp
+++ b/Graphics/drawMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "drawContext.h"
diff --git a/Graphics/drawPost.cpp b/Graphics/drawPost.cpp
index 6528e1676d1c1404c94710b8b9000adb5aec59c2..1a27bb913d30203a575362e8b888b2a63ccdc521 100644
--- a/Graphics/drawPost.cpp
+++ b/Graphics/drawPost.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include <algorithm>
diff --git a/Graphics/drawScales.cpp b/Graphics/drawScales.cpp
index 0b40e2d7ab40a8e05e4a0948622caf015cae5680..4bad743d2c97be1f628ed1b3bfffa3f45ea32579 100644
--- a/Graphics/drawScales.cpp
+++ b/Graphics/drawScales.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "drawContext.h"
diff --git a/Graphics/gl2gif.cpp b/Graphics/gl2gif.cpp
index f6bb1ae0150686754cd9bec3c40c9e863ac14fb7..273f64df1218f8b39c91d2ff493e0ab720b00e32 100644
--- a/Graphics/gl2gif.cpp
+++ b/Graphics/gl2gif.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 /*
  * Warning: This code is really a dirty hack. It SHOULD be cleaned
diff --git a/Graphics/gl2gif.h b/Graphics/gl2gif.h
index aed558124c330eed462299bbc46ba6bc78a19a6a..e26b239191b30ffe76cc93853d5fd231b8f683fa 100644
--- a/Graphics/gl2gif.h
+++ b/Graphics/gl2gif.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2GIF_H_
 #define _GL2GIF_H_
diff --git a/Graphics/gl2jpeg.cpp b/Graphics/gl2jpeg.cpp
index 37a80b7d2dee286b224bb697067585ad4c47d2f5..eb7c5aa63a120b5b7caf23792b5c883735e8d987 100644
--- a/Graphics/gl2jpeg.cpp
+++ b/Graphics/gl2jpeg.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "gl2jpeg.h"
diff --git a/Graphics/gl2jpeg.h b/Graphics/gl2jpeg.h
index a25df0704c38f17f30a05bf1d8ed9c11c000d695..2f64b99cc8767b81d4c25a18646bc4d3997697b7 100644
--- a/Graphics/gl2jpeg.h
+++ b/Graphics/gl2jpeg.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2JPEG_H_
 #define _GL2JPEG_H_
diff --git a/Graphics/gl2pgf.cpp b/Graphics/gl2pgf.cpp
index 0e04cc397ab005a80028529cb60eddb9e540960d..500efe89a4159b4f09e3ef646b49815cdd3f911a 100644
--- a/Graphics/gl2pgf.cpp
+++ b/Graphics/gl2pgf.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Sebastian Eiser
 
diff --git a/Graphics/gl2pgf.h b/Graphics/gl2pgf.h
index 830a16d2f25ebc6e685f4b48ec30ba8135c16e3d..586cd69886b47dae47fcc69bbb48972bac835c83 100644
--- a/Graphics/gl2pgf.h
+++ b/Graphics/gl2pgf.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2PGF_H_
 #define _GL2PGF_H_
diff --git a/Graphics/gl2png.cpp b/Graphics/gl2png.cpp
index 4916beb1145682ad3e57af78684b89405988b64a..2a7ce0e132e42725783fac3703565bcf64c6abcb 100644
--- a/Graphics/gl2png.cpp
+++ b/Graphics/gl2png.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "gl2png.h"
diff --git a/Graphics/gl2png.h b/Graphics/gl2png.h
index 8bb96d5f266659b74d0b7a2d8e4dfa56e901a9c5..b1ba0d15f5a1b2259a33c5498ffbee62124e0868 100644
--- a/Graphics/gl2png.h
+++ b/Graphics/gl2png.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2PNG_H_
 #define _GL2PNG_H_
diff --git a/Graphics/gl2ppm.cpp b/Graphics/gl2ppm.cpp
index 08c998bd6237ea7eea68d71e755be17b9bf1b6b2..18b5e3e89a6f11da41182ad5d01ae18544cb33e4 100644
--- a/Graphics/gl2ppm.cpp
+++ b/Graphics/gl2ppm.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "gl2ppm.h"
 
diff --git a/Graphics/gl2ppm.h b/Graphics/gl2ppm.h
index 1c71a523b66bc6b0a26f593b8030b1dbf79addda..82d438eeed42ced0397cefb88704accd11999d06 100644
--- a/Graphics/gl2ppm.h
+++ b/Graphics/gl2ppm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2PPM_H_
 #define _GL2PPM_H_
diff --git a/Graphics/gl2yuv.cpp b/Graphics/gl2yuv.cpp
index 8e3febbb8ac9b5ee8f901c82053dfc6643b26b80..dc5a0637577b9cec3604dc557d978fb2e3acf077 100644
--- a/Graphics/gl2yuv.cpp
+++ b/Graphics/gl2yuv.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 /*
  * This code is based on the rgbtoycc.c code from the MPEG-1 Video
diff --git a/Graphics/gl2yuv.h b/Graphics/gl2yuv.h
index ee82f83a09e4c8a5615d6fcebd59c61c72c252e9..06c38d4b7ea9dfcbcc995581ee77a96ad3f28e94 100644
--- a/Graphics/gl2yuv.h
+++ b/Graphics/gl2yuv.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2YUV_H_
 #define _GL2YUV_H_
diff --git a/Mesh/BDS.cpp b/Mesh/BDS.cpp
index 8df3a4a0022eab50aaa5bfefff0c5cf80436c83e..11a23f5a106261ee44fb7f2aa857ac5c9c1be186 100644
--- a/Mesh/BDS.cpp
+++ b/Mesh/BDS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stack>
 #include <math.h>
diff --git a/Mesh/BDS.h b/Mesh/BDS.h
index 1a8bf53c06cca7a56dac8cf75532a672eca712a3..b7b1b80df36c181d50d44702d59b23ba5cf18ddc 100644
--- a/Mesh/BDS.h
+++ b/Mesh/BDS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BDS_H_
 #define _BDS_H_
diff --git a/Mesh/BGMBase.cpp b/Mesh/BGMBase.cpp
index 35ba60d6477f1d9620ac97876890fbaab2182b51..fe7af255a5c8dda45febfc0fe671c90526277a9b 100644
--- a/Mesh/BGMBase.cpp
+++ b/Mesh/BGMBase.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BGMBase.h"
 
diff --git a/Mesh/BGMBase.h b/Mesh/BGMBase.h
index 5cf5deadbb2090bbc000dee3a024f67eb6a3517d..6a66b23ca68b39ae2210ed493ea1852ade3f3fea 100644
--- a/Mesh/BGMBase.h
+++ b/Mesh/BGMBase.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH_BASE_H_
 #define _BACKGROUND_MESH_BASE_H_
diff --git a/Mesh/BackgroundMesh.cpp b/Mesh/BackgroundMesh.cpp
index 0cd8f8b5a042eb6f3d8dbe81920d73fa02da471b..3f3f359396df0bf5b867733f62726677f0f7da07 100644
--- a/Mesh/BackgroundMesh.cpp
+++ b/Mesh/BackgroundMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "BackgroundMesh.h"
diff --git a/Mesh/BackgroundMesh.h b/Mesh/BackgroundMesh.h
index b31618f86d9081143092cbd77696ba88fb985187..7ad287d6a8a6ce14aeb860bd53001aea840b19bf 100644
--- a/Mesh/BackgroundMesh.h
+++ b/Mesh/BackgroundMesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH_H_
 #define _BACKGROUND_MESH_H_
diff --git a/Mesh/BackgroundMesh2D.cpp b/Mesh/BackgroundMesh2D.cpp
index 2e59853a2215a9914bb68aa0de75ab8262bf6ab4..014bf4e4d086b1ed286995d9ce841b653da1b12d 100644
--- a/Mesh/BackgroundMesh2D.cpp
+++ b/Mesh/BackgroundMesh2D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BackgroundMesh2D.h"
 #include "BackgroundMeshTools.h"
diff --git a/Mesh/BackgroundMesh2D.h b/Mesh/BackgroundMesh2D.h
index 1ac7554507c45b8cba37f6aec5d5bc547e8bf108..f4ed565f1776e763710a91269fe2f1e0d81f284b 100644
--- a/Mesh/BackgroundMesh2D.h
+++ b/Mesh/BackgroundMesh2D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH2D_H_
 #define _BACKGROUND_MESH2D_H_
diff --git a/Mesh/BackgroundMesh3D.cpp b/Mesh/BackgroundMesh3D.cpp
index b92b63ddce74140641b7ad6b4550b7587b40eae0..1cd67591cb09b9d4c284b5d7f890a049af84b783 100644
--- a/Mesh/BackgroundMesh3D.cpp
+++ b/Mesh/BackgroundMesh3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <fstream>
 #include <algorithm>
diff --git a/Mesh/BackgroundMesh3D.h b/Mesh/BackgroundMesh3D.h
index 6f2c52619b0af813fbb212c31a52699c38565628..2a7282d6d59b7f9658bd00c6063479180e196269 100644
--- a/Mesh/BackgroundMesh3D.h
+++ b/Mesh/BackgroundMesh3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH3D_H_
 #define _BACKGROUND_MESH3D_H_
diff --git a/Mesh/BackgroundMeshManager.cpp b/Mesh/BackgroundMeshManager.cpp
index 78f7b25224fb4f8398c68a60bb139b75e2b45ac5..59f0a8e916421ee126564cb5afb12a3d2790047d 100644
--- a/Mesh/BackgroundMeshManager.cpp
+++ b/Mesh/BackgroundMeshManager.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BackgroundMeshManager.h"
 #include "BGMBase.h"
diff --git a/Mesh/BackgroundMeshManager.h b/Mesh/BackgroundMeshManager.h
index 40702eb086277c8c8751e9a4743b612a345fec57..f7d6b6c6997bd83a87895864aa0afde93ec318e2 100644
--- a/Mesh/BackgroundMeshManager.h
+++ b/Mesh/BackgroundMeshManager.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH_MANAGER_H_
 #define _BACKGROUND_MESH_MANAGER_H_
diff --git a/Mesh/BackgroundMeshTools.cpp b/Mesh/BackgroundMeshTools.cpp
index 726b100b96270c5945e0af53ed1480bba1d55b13..fe6a091a6a816ef38b4ff036915cfb65d19e4049 100644
--- a/Mesh/BackgroundMeshTools.cpp
+++ b/Mesh/BackgroundMeshTools.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BackgroundMeshTools.h"
 #include "GFace.h"
diff --git a/Mesh/BackgroundMeshTools.h b/Mesh/BackgroundMeshTools.h
index bcb573da1f696af1168955c11b7e21d024997bce..9314d46256e3f21207946a7715d76ab38ad7e2a5 100644
--- a/Mesh/BackgroundMeshTools.h
+++ b/Mesh/BackgroundMeshTools.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH_TOOLS_H_
 #define _BACKGROUND_MESH_TOOLS_H_
diff --git a/Mesh/BoundaryLayers.cpp b/Mesh/BoundaryLayers.cpp
index c205cbb155c262d5eed86aadc5a8c65e42c17b73..e1986c36a0793c80001bbc89a6b0c02218c5fdf5 100644
--- a/Mesh/BoundaryLayers.cpp
+++ b/Mesh/BoundaryLayers.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "MLine.h"
diff --git a/Mesh/BoundaryLayers.h b/Mesh/BoundaryLayers.h
index aa801d6c4dbe8722625aa3c7793eebc3dad8c663..56d0584353611f87641317ca1c16ce5f0110f4aa 100644
--- a/Mesh/BoundaryLayers.h
+++ b/Mesh/BoundaryLayers.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BOUNDARY_LAYERS_H_
 #define _BOUNDARY_LAYERS_H_
diff --git a/Mesh/CMakeLists.txt b/Mesh/CMakeLists.txt
index 8465a887ae70ff1ec1e7ae9d38bf45788a21cc8b..aba1b46fb2b466d6f1271679ec1fd49746ab62d3 100644
--- a/Mesh/CMakeLists.txt
+++ b/Mesh/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
    meshGRegionBoundaryRecovery.cpp
diff --git a/Mesh/CenterlineField.cpp b/Mesh/CenterlineField.cpp
index 62cc1378b17b6081c167e1cc5cb1d8ff99b57ef2..dafdac3eb9e35061a8c25b089e778d9c8376c52e 100644
--- a/Mesh/CenterlineField.cpp
+++ b/Mesh/CenterlineField.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Mesh/CenterlineField.h b/Mesh/CenterlineField.h
index 167bf3caf94bed830a408f61ad2cdae1c25d24cf..33b2797464939192e5346cc868c1146afa9ecfa5 100644
--- a/Mesh/CenterlineField.h
+++ b/Mesh/CenterlineField.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Mesh/DivideAndConquer.cpp b/Mesh/DivideAndConquer.cpp
index e0c69e4c040fe90ab277ef505575094ddceb65b7..bc44779701576b470e778f36e000a7fce3f9cd94 100644
--- a/Mesh/DivideAndConquer.cpp
+++ b/Mesh/DivideAndConquer.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // Triangulation using a divide and conquer algorithm
 //
diff --git a/Mesh/DivideAndConquer.h b/Mesh/DivideAndConquer.h
index 6e14346ab0b9a2194a113a8793d68afc042cbccb..266e4fb8e86f97de706a64bb47a5b9a93d566872 100644
--- a/Mesh/DivideAndConquer.h
+++ b/Mesh/DivideAndConquer.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DIVIDE_AND_CONQUER_H_
 #define _DIVIDE_AND_CONQUER_H_
diff --git a/Mesh/Field.cpp b/Mesh/Field.cpp
index 772d2371b78a1c22313c15e5c84b7003082a1c9a..cef89a811ab365ebab5791d1569b1d3cfd9632c9 100644
--- a/Mesh/Field.cpp
+++ b/Mesh/Field.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Jonathan Lambrechts
diff --git a/Mesh/Field.h b/Mesh/Field.h
index af5e364eb003d9d74404277b851bbddd15111629..ee4f902e3902fd13f89eab857293c1e1096e77f7 100644
--- a/Mesh/Field.h
+++ b/Mesh/Field.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIELD_H_
 #define _FIELD_H_
diff --git a/Mesh/FieldPython.h b/Mesh/FieldPython.h
index 187f667f02dcbce0c8d0fba5c3b9b52af8578284..7ce1f49c4081f41e702f3da60c74df77407079b1 100644
--- a/Mesh/FieldPython.h
+++ b/Mesh/FieldPython.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIELD_PYTHON_H_
 #define _FIELD_PYTHON_H_
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 6e63f801d4c07292913829bfb7c9e2229a44dfb3..55adba595236d8e52d3c629c6ee23df6eba23617 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <stack>
diff --git a/Mesh/Generator.h b/Mesh/Generator.h
index a32485bdef6c7ea3c2792c5167d49f44e70d5b73..d698173f65c7bdc3bcffd7d44709f5a92482c60a 100644
--- a/Mesh/Generator.h
+++ b/Mesh/Generator.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GENERATOR_H_
 #define _GENERATOR_H_
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index 08a316f95c7eaf26318325bb40fba224f0ce8a20..74eefdf12ae54017b9d254b585a82dcfc579e2f6 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Koen Hillewaert
diff --git a/Mesh/HighOrder.h b/Mesh/HighOrder.h
index d080a75fc170d825f904f2711d9c13fa203f4c14..107f7fa6e7fd62e9f7d8106be1e5d5927f025fb5 100644
--- a/Mesh/HighOrder.h
+++ b/Mesh/HighOrder.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HIGH_ORDER_H_
 #define _HIGH_ORDER_H_
diff --git a/Mesh/Levy3D.cpp b/Mesh/Levy3D.cpp
index a26ae0ebfa5846ed4da357f7b5ef9749604714a9..34a5bb63e2e9cc51704afdc563a8e5c1fc291763 100644
--- a/Mesh/Levy3D.cpp
+++ b/Mesh/Levy3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/Levy3D.h b/Mesh/Levy3D.h
index 95d951e0aed62d0c28380b2384b1c31000bb7611..0005b232e2810cd1801fc6a53b796245b310ae65 100644
--- a/Mesh/Levy3D.h
+++ b/Mesh/Levy3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/QuadTriExtruded2D.cpp b/Mesh/QuadTriExtruded2D.cpp
index befecbc72b5855daee887bd86c29431009b184ea..d662c404d47405c57c5904a8c0a6675381d2ce68 100644
--- a/Mesh/QuadTriExtruded2D.cpp
+++ b/Mesh/QuadTriExtruded2D.cpp
@@ -16,11 +16,11 @@ Geuzaine and J.-F. Remacle with the understanding that his contribution shall be
 cited appropriately.
 
 All reused or original Gmsh code is Copyright (C) 1997-2014 C. Geuzaine,
-J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
+J.-F. Remacle Gmsh is available at: www.gmsh.info
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
diff --git a/Mesh/QuadTriExtruded2D.h b/Mesh/QuadTriExtruded2D.h
index 9a6b26fe3eb68054fb81a884243bb773c5976383..3fe9e2fe100cfac0e0398938328e6a40b1f8a41f 100644
--- a/Mesh/QuadTriExtruded2D.h
+++ b/Mesh/QuadTriExtruded2D.h
@@ -20,7 +20,7 @@ J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
diff --git a/Mesh/QuadTriExtruded3D.cpp b/Mesh/QuadTriExtruded3D.cpp
index b81b4b5b494fba5b18aba4133ae908332ceeec53..78a3df53ce4adfe515e226e0df1f2ff3cb1a3dfe 100644
--- a/Mesh/QuadTriExtruded3D.cpp
+++ b/Mesh/QuadTriExtruded3D.cpp
@@ -16,11 +16,11 @@ Geuzaine and J.-F. Remacle with the understanding that his contribution shall be
 cited appropriately.
 
 All reused or original Gmsh code is Copyright (C) 1997-2014 C. Geuzaine,
-J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
+J.-F. Remacle Gmsh is available at: www.gmsh.info
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
diff --git a/Mesh/QuadTriExtruded3D.h b/Mesh/QuadTriExtruded3D.h
index 6bb19b6cb6e2df97231cf258015994a9d54ac7c3..2d71fb3f9dfa6e09cc6401743a1c8f19758c095c 100644
--- a/Mesh/QuadTriExtruded3D.h
+++ b/Mesh/QuadTriExtruded3D.h
@@ -20,7 +20,7 @@ J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
diff --git a/Mesh/QuadTriTransfinite3D.cpp b/Mesh/QuadTriTransfinite3D.cpp
index 0cef5d09b2495a683f98f3cec5029f4e80c4bd05..1d194f3946704aae6f7f484ae8f4db1ef2e5281a 100644
--- a/Mesh/QuadTriTransfinite3D.cpp
+++ b/Mesh/QuadTriTransfinite3D.cpp
@@ -14,10 +14,10 @@ Christophe Geuzaine and J.-F. Remacle with the understanding that
 his contribution shall be cited appropriately.
 
 All reused or original Gmsh code is Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
-Gmsh is available at: www.geuz.org/gmsh
+Gmsh is available at: www.gmsh.info
 
 For Gmsh license information, see the LICENSE.txt file for license information. Please report all
-Gmsh bugs and problems to the public mailing list <gmsh@geuz.org>.
+Gmsh bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, Version 2,
diff --git a/Mesh/QuadTriTransfinite3D.h b/Mesh/QuadTriTransfinite3D.h
index 92f035a19f44e3e89df5927c346109d2549fb626..2777c0a5b0f3199ebcea396c7cfb7777633620ad 100644
--- a/Mesh/QuadTriTransfinite3D.h
+++ b/Mesh/QuadTriTransfinite3D.h
@@ -17,7 +17,7 @@ All reused or original Gmsh code is Copyright (C) 1997-2016 C. Geuzaine, J.-F. R
 Gmsh is available at: www.geuz.org/gmsh
 
 For Gmsh license information, see the LICENSE.txt file for license information. Please report all
-Gmsh bugs and problems to the public mailing list <gmsh@geuz.org>.
+Gmsh bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, Version 2,
diff --git a/Mesh/QuadTriUtils.cpp b/Mesh/QuadTriUtils.cpp
index 0ddfdd39a3db90cc99df714bd02070fd29e0e1c4..4e0edb827b15d40811cbe1a9ac2032383f34b8b4 100644
--- a/Mesh/QuadTriUtils.cpp
+++ b/Mesh/QuadTriUtils.cpp
@@ -16,11 +16,11 @@ Geuzaine and J.-F. Remacle with the understanding that his contribution shall be
 cited appropriately.
 
 All reused or original Gmsh code is Copyright (C) 1997-2014 C. Geuzaine,
-J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
+J.-F. Remacle Gmsh is available at: www.gmsh.info
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
@@ -847,4 +847,3 @@ void fill_touch_bnd( int touch_bnd[], std::vector<bool> vert_bnd, int n_lat )
     }
   }
 }
-
diff --git a/Mesh/QuadTriUtils.h b/Mesh/QuadTriUtils.h
index c458410c733fc78337997b9ed93ed42e9844df59..55f3eecde26bc6f2d142b441a64c7277cf1c82ba 100644
--- a/Mesh/QuadTriUtils.h
+++ b/Mesh/QuadTriUtils.h
@@ -17,7 +17,7 @@ All reused or original Gmsh code is Copyright (C) 1997-2016 C. Geuzaine, J.-F. R
 Gmsh is available at: www.geuz.org/gmsh
 
 For Gmsh license information, see the LICENSE.txt file for license information. Please report all
-Gmsh bugs and problems to the public mailing list <gmsh@geuz.org>.
+Gmsh bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, Version 2,
diff --git a/Mesh/ThinLayer.cpp b/Mesh/ThinLayer.cpp
index 8d8df92ffc4edc5e112b8cf01472dc4389de700c..b8bdff41bf02c174eea047ba983415b2726d283a 100644
--- a/Mesh/ThinLayer.cpp
+++ b/Mesh/ThinLayer.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Author: Nicolas Kowalski
 
diff --git a/Mesh/ThinLayer.h b/Mesh/ThinLayer.h
index 5c6f5647f8c38d8762532383afb1ce51252065a4..ae3524d4970d8f8653304e30c003e99df20c29c5 100644
--- a/Mesh/ThinLayer.h
+++ b/Mesh/ThinLayer.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Author: Nicolas Kowalski
 
diff --git a/Mesh/Voronoi3D.cpp b/Mesh/Voronoi3D.cpp
index 3a65e3540fe946e1c57e1a57be6e104a62e6af12..202b9a866cdef1cde3feac4f087883f76b18a444 100644
--- a/Mesh/Voronoi3D.cpp
+++ b/Mesh/Voronoi3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/Voronoi3D.h b/Mesh/Voronoi3D.h
index f09cde08b5143eb10a6bed6f681cdc337d534bff..ed6b3b57431d6465c1371e421dabd589d8bdf272 100644
--- a/Mesh/Voronoi3D.h
+++ b/Mesh/Voronoi3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/cross3D.h b/Mesh/cross3D.h
index 47be309ca0aaf07f4a6d381c85aaac748aca5d61..b3e20280504d3e102213707fb40ebbc93b6b70c9 100644
--- a/Mesh/cross3D.h
+++ b/Mesh/cross3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   François Henrotte
diff --git a/Mesh/delaunay3d.cpp b/Mesh/delaunay3d.cpp
index 707ab56e374a9a52dcf59fe3bb24b256ac559bcc..cbba094d890bffe8ff28b0b912244fdbe3c4f61e 100644
--- a/Mesh/delaunay3d.cpp
+++ b/Mesh/delaunay3d.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifdef _OPENMP
 #include <omp.h>
diff --git a/Mesh/delaunay3d.h b/Mesh/delaunay3d.h
index 4dff95ed9b9e3548986eae1ab5e11ff531f94969..6ec913bb31f07534c47b6d1e66fdef4b5d4929bf 100644
--- a/Mesh/delaunay3d.h
+++ b/Mesh/delaunay3d.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DELAUNAY3D_H_
 #define _DELAUNAY3D_H_
diff --git a/Mesh/delaunay3d_private.h b/Mesh/delaunay3d_private.h
index 0533a0842581d11f674f37f8dea8b1b7bbd80129..38eb9ebbf61da16cd9007b31fbf510a3082ebf8e 100644
--- a/Mesh/delaunay3d_private.h
+++ b/Mesh/delaunay3d_private.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DELAUNAY3D_H_
 #define _DELAUNAY3D_H_
diff --git a/Mesh/directions3D.cpp b/Mesh/directions3D.cpp
index c909c6b884ca21b4f470c02b136c9f2f05a614d3..ad92e9d78623ef3d0eb8423611522423efb196f0 100644
--- a/Mesh/directions3D.cpp
+++ b/Mesh/directions3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier François Henrotte
diff --git a/Mesh/directions3D.h b/Mesh/directions3D.h
index 80c15bce281d1023e12dd4b20faa9a44e9e63834..e8d4e5696901c181f42765c11bc1a58e3e6b06e4 100644
--- a/Mesh/directions3D.h
+++ b/Mesh/directions3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier François Henrotte
diff --git a/Mesh/filterElements.cpp b/Mesh/filterElements.cpp
index 9dd565e4e34b1cb3e991c4f2a1d691941bdf441b..380838fcadd317e72300195cef16e2f3b51c3c80 100644
--- a/Mesh/filterElements.cpp
+++ b/Mesh/filterElements.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include <vector>
diff --git a/Mesh/filterElements.h b/Mesh/filterElements.h
index 8a08b5545110b15bda5a2f2945f4e4344489cb2e..60f16ff06a381eeb15843efdfe12a0c770265c0a 100644
--- a/Mesh/filterElements.h
+++ b/Mesh/filterElements.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FILTER_OVERLAPPING_ELEMENTS_
 #define _FILTER_OVERLAPPING_ELEMENTS_
diff --git a/Mesh/meshGEdge.cpp b/Mesh/meshGEdge.cpp
index 56c6b718e5b4f1d0b3dbf2068e964141ec098b34..91bc4bf2a1366b6075db2bee26671f35220055eb 100644
--- a/Mesh/meshGEdge.cpp
+++ b/Mesh/meshGEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GModel.h"
diff --git a/Mesh/meshGEdge.h b/Mesh/meshGEdge.h
index f6bb3744aacdfcf31e2d60f5553560e7c705d3c0..7f06a44808d923152a9b29461c98bfdc1a654fc5 100644
--- a/Mesh/meshGEdge.h
+++ b/Mesh/meshGEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GEDGE_H_
 #define _MESH_GEDGE_H_
diff --git a/Mesh/meshGEdgeExtruded.cpp b/Mesh/meshGEdgeExtruded.cpp
index 13f180edee990f210ec488d29b47f1a6c028cfd2..53fd1ffc8601d708a08c8b7e1ff965179cba5052 100644
--- a/Mesh/meshGEdgeExtruded.cpp
+++ b/Mesh/meshGEdgeExtruded.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "GModel.h"
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 650be44f5c4f9b8c132e039e756aaa138fa0034a..a6c45fe18f99f69460e1308126ed65c996cb5d0f 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <stdlib.h>
diff --git a/Mesh/meshGFace.h b/Mesh/meshGFace.h
index 716251db33053aeff4741c176ad28f72f2566c9d..ea9baac2b98a447960459dff7bfc0c099c36ca91 100644
--- a/Mesh/meshGFace.h
+++ b/Mesh/meshGFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_H_
 #define _MESH_GFACE_H_
diff --git a/Mesh/meshGFaceBDS.cpp b/Mesh/meshGFaceBDS.cpp
index 85fd5f0a142145a785569e0802b4e4a7f29e6073..9af2233c1f6c858c993a8a7f2c49691a7a6b3b98 100644
--- a/Mesh/meshGFaceBDS.cpp
+++ b/Mesh/meshGFaceBDS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GmshMessage.h"
diff --git a/Mesh/meshGFaceBDS.h b/Mesh/meshGFaceBDS.h
index 2833cd36f90ba45d1e5674ce720268730e10dd31..f8a576948a4e7af3761e1f88d6f5e337ecdad0bd 100644
--- a/Mesh/meshGFaceBDS.h
+++ b/Mesh/meshGFaceBDS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_BDS_H_
 #define _MESH_GFACE_BDS_H_
diff --git a/Mesh/meshGFaceBamg.cpp b/Mesh/meshGFaceBamg.cpp
index 81ea0e6bb9d3bdfff94aba65100e2df18d32c6a9..644fb882bd4a9e6a85ebe50261c70ebe87e8556d 100644
--- a/Mesh/meshGFaceBamg.cpp
+++ b/Mesh/meshGFaceBamg.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <iostream>
 #include "meshGFaceBamg.h"
diff --git a/Mesh/meshGFaceBamg.h b/Mesh/meshGFaceBamg.h
index 84b53d20b46469ec68507c5ef39ed9fbc351d180..95b99b168c6f1ababf349da6fd0fb0da4831a4f3 100644
--- a/Mesh/meshGFaceBamg.h
+++ b/Mesh/meshGFaceBamg.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESHGFACE_BAMG_
 #define _MESHGFACE_BAMG_
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index 4b9addfd238b56e2a2a1c9fef302b39f5cd6bdb5..6500ecc58a3c703455d9bff2247651309f192688 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include <map>
diff --git a/Mesh/meshGFaceDelaunayInsertion.h b/Mesh/meshGFaceDelaunayInsertion.h
index ecc5397fa54fba97da58d024a527a620827eadff..1dede74ed4af609661f4c15a0797c9f4905af0a3 100644
--- a/Mesh/meshGFaceDelaunayInsertion.h
+++ b/Mesh/meshGFaceDelaunayInsertion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_DELAUNAY_INSERTIONFACE_H_
 #define _MESH_GFACE_DELAUNAY_INSERTIONFACE_H_
diff --git a/Mesh/meshGFaceElliptic.cpp b/Mesh/meshGFaceElliptic.cpp
index f580e7fa127bf894f0691caf7ebad75889c250eb..3589efa5e51e40cfdbad2bf5b2165b09f7dda99a 100644
--- a/Mesh/meshGFaceElliptic.cpp
+++ b/Mesh/meshGFaceElliptic.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stack>
 #include "GmshConfig.h"
diff --git a/Mesh/meshGFaceElliptic.h b/Mesh/meshGFaceElliptic.h
index 2b48e5d895ced6b0b678dd36e1a400db46149fc2..a6fc2165a04c596b5c0d713ccdfb970191d553af 100644
--- a/Mesh/meshGFaceElliptic.h
+++ b/Mesh/meshGFaceElliptic.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_ELLIPTIC_H_
 #define _MESH_GFACE_ELLIPTIC_H_
diff --git a/Mesh/meshGFaceExtruded.cpp b/Mesh/meshGFaceExtruded.cpp
index f48df1083fbf95f74ad31e0be62613f0a2d8ce04..b1037065038c01129773182bc4661243f1585c2f 100644
--- a/Mesh/meshGFaceExtruded.cpp
+++ b/Mesh/meshGFaceExtruded.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "GModel.h"
diff --git a/Mesh/meshGFaceLloyd.cpp b/Mesh/meshGFaceLloyd.cpp
index 3e8378eba83cc6167b7d200145c59c0db3c5ef63..7317d42d0093826e1173e51d6c073a4e58bf7faa 100644
--- a/Mesh/meshGFaceLloyd.cpp
+++ b/Mesh/meshGFaceLloyd.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/meshGFaceLloyd.h b/Mesh/meshGFaceLloyd.h
index 761bff73fdf08b854377ec0fba5125f1cc4e1750..d7382b6255bdffd51db0db7d510a8b1608332f0f 100644
--- a/Mesh/meshGFaceLloyd.h
+++ b/Mesh/meshGFaceLloyd.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/meshGFaceOptimize.cpp b/Mesh/meshGFaceOptimize.cpp
index 83e170937d1076086d7f6bf1cfe50a164f807fa0..9cf401938e6d2e17f9760b255b0d8c772aea9a70 100644
--- a/Mesh/meshGFaceOptimize.cpp
+++ b/Mesh/meshGFaceOptimize.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stack>
 #include "GmshConfig.h"
diff --git a/Mesh/meshGFaceOptimize.h b/Mesh/meshGFaceOptimize.h
index 39f82083ba0ee0a492178127e626fd5d3c72dc07..caf3244ab2a0ca0834a2c7e07d73eedc8013bc8d 100644
--- a/Mesh/meshGFaceOptimize.h
+++ b/Mesh/meshGFaceOptimize.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_OPTIMIZE_H_
 #define _MESH_GFACE_OPTIMIZE_H_
diff --git a/Mesh/meshGFaceQuadrilateralize.cpp b/Mesh/meshGFaceQuadrilateralize.cpp
index f4ea30dd3f1b1dc448f7f8ba12e5252b8a9b9b62..0dc78d68866a65a8d123320b25494c90f6bd422f 100644
--- a/Mesh/meshGFaceQuadrilateralize.cpp
+++ b/Mesh/meshGFaceQuadrilateralize.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "meshGFaceQuadrilateralize.h"
 #include "GmshMessage.h"
diff --git a/Mesh/meshGFaceQuadrilateralize.h b/Mesh/meshGFaceQuadrilateralize.h
index 76b5065d2337d517666c278ef72174584a0dd6a1..1f60efbe9bf2300542c57a318683342c671f8b1e 100644
--- a/Mesh/meshGFaceQuadrilateralize.h
+++ b/Mesh/meshGFaceQuadrilateralize.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_QUADRILATERALIZE_
 #define _MESH_GFACE_QUADRILATERALIZE_
diff --git a/Mesh/meshGFaceRecombine.cpp b/Mesh/meshGFaceRecombine.cpp
index 72078265a9ba6494dcbd4764292b8d6678c1b719..1b52eb2bb17b189faf097fa5d844754ec1ea6d45 100644
--- a/Mesh/meshGFaceRecombine.cpp
+++ b/Mesh/meshGFaceRecombine.cpp
@@ -1,7 +1,7 @@
-// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Amaury Johnen (a.johnen@ulg.ac.be)
@@ -211,7 +211,7 @@ Recombine2D::Recombine2D(GFace *gf, bool col)
     Msg::Error("[Recombine2D] Data instance exists, should not !");
     return;
   }
-  
+
   Recombine2D::_cur = this;
   construct();
 }
@@ -235,21 +235,21 @@ bool Recombine2D::construct()
     Msg::Error("[Recombine2D] Data instance exists, should not !");
     return false;
   }
-  
+
   orientMeshGFace orienter;
   orienter(_gf);
   Rec2DVertex::initStaticTable();
   backgroundMesh::set(_gf); // this doesn't work after call 'recombineWithBlossom()'
   _bgm = backgroundMesh::current();
   _data = new Rec2DData();
-  
+
   static int po = -1;
   if (++po < 1) {
     Msg::Warning("FIXME Why {mesh 2} then {mesh 0} then {mesh 2} imply not corner vertices");
     Msg::Warning("FIXME Why more vertices after first mesh generation");
     Msg::Warning("FIXME Update of Action pointing to edge and vertex (when change)");
   }
-  
+
   // Be able to compute geometrical angle at corners
   std::map<MVertex*, AngleData> mapCornerVert;
   {
@@ -270,7 +270,7 @@ bool Recombine2D::construct()
     // triangles
     for (unsigned int i = 0; i < _gf->triangles.size(); ++i) {
       MTriangle *t = _gf->triangles[i];
-      
+
       Rec2DVertex *rv[3];
       for (int j = 0; j < 3; ++j) {
         MVertex *v = t->getVertex(j);
@@ -293,13 +293,13 @@ bool Recombine2D::construct()
         if ( !(re[j] = Rec2DVertex::getCommonEdge(rv[j], rv[(j+1)%3])) )
           re[j] = new Rec2DEdge(rv[j], rv[(j+1)%3]);
       }
-      
+
       new Rec2DElement(t, re, rv);
     }
     // quadrangles
     for (unsigned int i = 0; i < _gf->quadrangles.size(); ++i) {
       MQuadrangle *q = _gf->quadrangles[i];
-      
+
       Rec2DVertex *rv[4];
       for (int j = 0; j < 4; ++j) {
         MVertex *v = q->getVertex(j);
@@ -322,7 +322,7 @@ bool Recombine2D::construct()
         if ( !(re[j] = Rec2DVertex::getCommonEdge(rv[i], rv[(i+1)%3])) )
           re[j] = new Rec2DEdge(rv[i], rv[(i+1)%3]);
       }
-      
+
       new Rec2DElement(q, re, rv);
     }
   }
@@ -379,10 +379,10 @@ bool Recombine2D::construct()
       }
     }
   }
-  
+
   Rec2DData::checkObsolete();
   _data->printState();
-  
+
   if (_recombineWithBlossom) recombineWithBlossom(_gf, .0, .16, elist, t2n);
   _gf->quadrangles.clear();
   //
@@ -399,8 +399,8 @@ bool Recombine2D::recombine()
     Msg::Error("[Recombine2D] Data instance dosen't exist. Have you called construct() ?");
     return false;
   }
-  
-  I(("Recombining... #actions = %d, horizon = %d", 
+
+  I(("Recombining... #actions = %d, horizon = %d",
             Rec2DData::getNumAction(), _horizon ));
 #ifdef REC2D_DRAW
   __draw(.0);
@@ -409,15 +409,15 @@ bool Recombine2D::recombine()
   _checkIfNotAllQuad = _checkIfNotAllQuad && !_collapses;
   _avoidIfNotAllQuad = _avoidIfNotAllQuad && _checkIfNotAllQuad;
   _revertIfNotAllQuad = _revertIfNotAllQuad && _avoidIfNotAllQuad;
-  
+
   Rec2DNode *root = new Rec2DNode(NULL, NULL, _horizon);
   Rec2DNode *currentNode = Rec2DNode::selectBestNode(root);
-  
+
   while (currentNode) {
     currentNode->lookahead(_horizon);
     currentNode = Rec2DNode::selectBestNode(currentNode);
   }
-  
+
 #ifdef REC2D_DRAW
   __draw(.0);
 #endif
@@ -471,7 +471,7 @@ double Recombine2D::recombine(int depth)
 #endif
   Rec2DNode *root = new Rec2DNode(NULL, NULL, depth);
   Rec2DNode *currentNode = Rec2DNode::selectBestNode(root);
-  
+
   while (currentNode) {
     I(("boucle recombine"));
 #ifdef DRAW_ALL_TIME_STEP
@@ -492,7 +492,7 @@ double Recombine2D::recombine(int depth)
     currentNode->lookahead(depth);
     currentNode = Rec2DNode::selectBestNode(currentNode);
   }
-  
+
   Msg::Info("-------- %g", Rec2DData::getGlobalQuality());
   return Rec2DData::getGlobalQuality();
   //_data->printState();
@@ -508,13 +508,13 @@ void Recombine2D::recombineSameAsBlossom() // check if quality ok
   //recombineWithBlossom(_gf, .0, 1.1, elist, t2n);
   _data->_quad = _gf->quadrangles;
   Recombine2D::drawStateOrigin();
-  
+
   std::map<int, Rec2DElement*> n2rel;
-  std::map<MElement*,int>::iterator it = t2n.begin(); 
+  std::map<MElement*,int>::iterator it = t2n.begin();
   for (; it != t2n.end(); ++it) {
     n2rel[it->second] = Rec2DData::getRElement(it->first);
   }
-  
+
   int blosQual = 0;
   for (int i = 0; i < _cur->elist[0]; ++i) {
     Rec2DElement *tri1 = n2rel[_cur->elist[3*i+1]];
@@ -538,7 +538,7 @@ void Recombine2D::recombineSameAsBlossom() // check if quality ok
     ra->apply(dc, v);
     drawStateOrigin();
   }
-  
+
   Msg::Info("Recombine2D Blossom Quality %d => %d", Rec2DData::getBlosQual(), 100*_cur->elist[0]-Rec2DData::getBlosQual());
   Msg::Info("vs Blossom Blossom Quality %d", blosQual);
   if (blosQual == 100*_cur->elist[0]-Rec2DData::getBlosQual())
@@ -555,13 +555,13 @@ void Recombine2D::recombineSameAsHeuristic()
   _lastRunTime = Cpu() - globtime;
   _data->_quad = _gf->quadrangles;
   drawStateOrigin();
-  
+
   std::map<int, Rec2DElement*> n2rel;
-  std::map<MElement*,int>::iterator it = t2n.begin(); 
+  std::map<MElement*,int>::iterator it = t2n.begin();
   for (; it != t2n.end(); ++it) {
     n2rel[it->second] = Rec2DData::getRElement(it->first);
   }
-  
+
   int heurQual = 0;
   for (int i = 0; i < _cur->elist[0]; ++i) {
     Rec2DElement *tri1 = n2rel[_cur->elist[3*i+1]];
@@ -585,7 +585,7 @@ void Recombine2D::recombineSameAsHeuristic()
     ra->apply(dc, v);
     drawStateOrigin();
   }
-  
+
   _noProblemIfObsolete = false;
   Msg::Info("Recombine2D Blossom Quality %d => %d", Rec2DData::getBlosQual(), 100*_cur->elist[0]-Rec2DData::getBlosQual());
   Msg::Info("vs Heuristic Blossom Quality %d", heurQual);
@@ -614,10 +614,10 @@ void Recombine2D::recombineGreedy(bool constrained)
 //{
 //  Rec2DNode root(NULL, NULL);
 //  _data->printState();
-//  
+//
 //  Msg::Info("best global value : %g", root._getBestSequenceReward());
 //  Msg::Info("num end node : %d", Rec2DData::getNumEndNode());
-//  
+//
 //  Rec2DData::sortEndNode();
 //  Rec2DData::drawEndNode(100);
 //  //_gf->triangles.clear();
@@ -660,7 +660,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
   if (++a == 1) Msg::Warning("FIXME check entities");
   //DEBUG(Rec2DData::checkEntities();)
   actions.clear();
-  
+
   const Rec2DNode *treeNode = node;
   if (Recombine2D::onlyRecombinations() && Recombine2D::priorityOfOneAction()) {
     if (neighbourEl.size()) { // check if there is one in neighbour
@@ -697,7 +697,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
         treeNode = treeNode->getFather();
       }
     }
-    
+
     Rec2DData::getUniqueOneActions(actions); // get all One Action
     if (actions.size()) {
       Rec2DAction *ra = actions[rand() % actions.size()];
@@ -707,8 +707,8 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
       return;
     }
   }
-  
-  
+
+
   std::vector<Rec2DElement*> elements;
   Rec2DAction *ra = NULL;
   Rec2DElement *rel = NULL;
@@ -727,7 +727,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
     case 4 :
       if (!_cur->_curNode->isInSequence()) {
         std::vector<Rec2DElement*> elem;
-        
+
         if (_cur->_curNode->getFather()) {
           _cur->_curNode->getAction()->getNeighbElemWithActions(elem);
           if (elem.size()) {
@@ -735,7 +735,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
             break;
           }
         }
-        
+
         while (_cur->_curNode->notInSubTree()) {
           _cur->_curNode = _cur->_curNode->getSon();
           _cur->_curNode->getAction()->getNeighbElemWithActions(elem);
@@ -747,19 +747,19 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
         if (rel) break;
         // if not, goto case 5 (i.e. try to find in the sequence)
       }
-    
+
     case 6 :
     case 5 :
     {
       while (_cur->_curNode->notInSubTree()) _cur->_curNode = _cur->_curNode->getSon();
       std::vector<Rec2DElement*> elem;
-      
+
       treeNode = _cur->_curNode;
       while (treeNode != node) {
         tmpNode = node;
         while (tmpNode->getFather() != treeNode) tmpNode = tmpNode->getFather();
         treeNode = tmpNode;
-        
+
         treeNode->getAction()->getNeighbElemWithActions(elem);
         if (elem.size()) {
           rel = elem[rand() % (int)elem.size()];
@@ -768,7 +768,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
       }
       if (rel) break;
     }
-    
+
     default :
     case 3 : // triangle of best neighbour action
       //I(("3"));
@@ -788,14 +788,14 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
       }
     end :
       if (rel) break;
-      
+
     case 2 : // random neighbour triangle
     //I(("2"));
       if (neighbourEl.size()) {
         rel = neighbourEl[rand() % (int)neighbourEl.size()];
         break;
       }
-      
+
     case 1 : // random triangle of best action
     //I(("1"));
       if (Recombine2D::onlyRecombinations() && _cur->_strategy != 1 && node) {
@@ -835,7 +835,7 @@ end2 :
       rel = ra->getRandomElement();
       break;
   }
-//#ifdef REC2D_DRAW  
+//#ifdef REC2D_DRAW
 //  unsigned int col = CTX::instance()->packColor(90, 128, 85, 255);
 //  rel->getMElement()->setCol(col);
 //#endif
@@ -897,7 +897,7 @@ void Recombine2D::compareWithBlossom()
   Msg::Info("Blossom %d", totalBlossom);
   delete elist;
   t2n.clear();
-  
+
   Rec2DData::clearChanges();
 #ifdef DRAW_WHEN_SELECTED // draw state at origin
     __drawWait(time, REC2D_WAIT_SELECTED);
@@ -1005,10 +1005,10 @@ double Recombine2D::_geomAngle(const MVertex *v,
     return M_PI / 2.;
   }
   static const double prec = 100.;
-  
+
   SVector3 vectv = SVector3(v->x(), v->y(), v->z());
   SVector3 firstDer0, firstDer1;
-  
+
   for (unsigned int k = 0; k < 2; ++k) {
     GEdge *ge = gEdge[k];
     SVector3 vectlb = ge->position(ge->getLowerBound());
@@ -1027,13 +1027,13 @@ double Recombine2D::_geomAngle(const MVertex *v,
     if (k == 0)
       firstDer0 = firstDer1;
   }
-  
+
   firstDer0 = firstDer0 * (1. / norm(firstDer0));
   firstDer1 = firstDer1 * (1. / norm(firstDer1));
-  
+
   double angle1 = acos(dot(firstDer0, firstDer1));
   double angle2 = 2. * M_PI - angle1;
-  
+
   double angleMesh = .0;
   for (unsigned int i = 0; i < elem.size(); ++i) {
     MElement *el = elem[i];
@@ -1048,7 +1048,7 @@ double Recombine2D::_geomAngle(const MVertex *v,
     angleMesh += angle3Vertices(el->getVertex((k+numV-1) % numV), v,
                                 el->getVertex((k+1) % numV)    );
   }
-  
+
   if (angleMesh < M_PI)
     return angle1;
   return angle2;
@@ -1092,17 +1092,17 @@ Rec2DData::~Rec2DData()
 double Rec2DData::getValVert(Rec2DQualCrit crit)
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-  
+
   switch (crit) {
     case BlossomQuality :
       return -1.;
-      
+
     case VertQuality :
       return static_cast<double>(_cur->_1valVert);
-    
+
     case VertEdgeQuality :
       return static_cast<double>(_cur->_2valVert);
-    
+
     default :
       Msg::Error("[Rec2DData:getValVert] Unknown quality criterion");
   }
@@ -1117,7 +1117,7 @@ void Rec2DData::add(const Rec2DEdge *re)
   }
   ((Rec2DEdge*)re)->_pos = _cur->_edges.size();
   _cur->_edges.push_back((Rec2DEdge*)re);
-  
+
   _cur->_numEdge += re->getWeight();
   _cur->_2valEdge +=re->getWeightedQual();
 }
@@ -1130,7 +1130,7 @@ void Rec2DData::add(const Rec2DVertex *rv)
   }
   ((Rec2DVertex*)rv)->_pos = _cur->_vertices.size();
   _cur->_vertices.push_back((Rec2DVertex*)rv);
-  
+
   ++_cur->_numVert;
   _cur->_1valVert += rv->getQual(VertQuality);
   _cur->_2valVert += rv->getQual(VertEdgeQuality);
@@ -1145,7 +1145,7 @@ void Rec2DData::add(const Rec2DElement *rel)
   ((Rec2DElement*)rel)->_pos = _cur->_elements.size();
   _cur->_elements.push_back((Rec2DElement*)rel);
   _cur->_mel2rel[rel->getMElement()] = (Rec2DElement*)rel;
-  
+
 #if 1//def REC2D_DRAW
   MTriangle *t = rel->getMTriangle();
   MQuadrangle *q = rel->getMQuadrangle();
@@ -1164,7 +1164,7 @@ void Rec2DData::rmv(const Rec2DEdge *re)
   _cur->_edges[re->_pos] = _cur->_edges.back();
   _cur->_edges.pop_back();
   ((Rec2DEdge*)re)->_pos = -1;
-  
+
   _cur->_numEdge -= re->getWeight();
   _cur->_2valEdge -=re->getWeightedQual();
 }
@@ -1179,7 +1179,7 @@ void Rec2DData::rmv(const Rec2DVertex *rv)
   _cur->_vertices[rv->_pos] = _cur->_vertices.back();
   _cur->_vertices.pop_back();
   ((Rec2DVertex*)rv)->_pos = -1;
-  
+
   --_cur->_numVert;
   _cur->_1valVert -= rv->getQual(VertQuality);
   _cur->_2valVert -= rv->getQual(VertEdgeQuality);
@@ -1196,7 +1196,7 @@ void Rec2DData::rmv(const Rec2DElement *rel)
   _cur->_elements.pop_back();
   ((Rec2DElement*)rel)->_pos = -1;
   _cur->_mel2rel.erase(rel->getMElement());
-  
+
 #if 1//def REC2D_DRAW
   MTriangle *t = rel->getMTriangle();
   if (t) {
@@ -1262,7 +1262,7 @@ Rec2DAction* Rec2DData::getBestAction()
     return NULL;
   /*Action *ac = *std::max_element(_cur->_actions.begin(),
                                  _cur->_actions.end(), lessAction());
-  
+
   return const_cast<Rec2DAction*>(ac->action);*/
   return *(_cur->_sortedActions.begin());
 }
@@ -1282,7 +1282,7 @@ void Rec2DData::checkObsolete()
     if (_cur->_actions[i]->action->isObsolete())
       obsoletes.push_back((Rec2DAction*)_cur->_actions[i]->action);
   }
-  
+
   for (unsigned int i = 0; i < obsoletes.size(); ++i)
     delete obsoletes[i];
 }
@@ -1452,7 +1452,7 @@ void Rec2DData::associateParity(int pOld, int pNew, Rec2DDataChange *rdc)
     if (++a == 10)
       Msg::Warning("[Rec2DData] AND LOOK AT ME WHEN I TALK TO YOU !");
   }
-  
+
   std::map<int, std::vector<Rec2DVertex*> >::iterator it;
   std::vector<Rec2DVertex*> *vect, *vectNew;
   {
@@ -1475,7 +1475,7 @@ void Rec2DData::associateParity(int pOld, int pNew, Rec2DDataChange *rdc)
     vectNew->insert(vectNew->end(), vect->begin(), vect->end());
     _cur->_parities.erase(it);
   }
-  
+
   pOld = otherParity(pOld);
   pNew = otherParity(pNew);
   {
@@ -1525,18 +1525,18 @@ void Rec2DData::clearChanges()
 double Rec2DData::getGlobalQuality(Rec2DQualCrit crit)
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-  
+
   switch(crit) {
     case BlossomQuality :
       return _cur->_0blossomQuality;
-      
+
     case VertQuality :
       return static_cast<double>(_cur->_1valVert) / _cur->_numVert;
-    
+
     case VertEdgeQuality :
       return static_cast<double>(_cur->_2valVert) / _cur->_numVert
              *static_cast<double>(_cur->_2valEdge) / _cur->_numEdge;
-    
+
     default :
       Msg::Error("[Rec2DData:getGlobalQuality] Unknown quality criterion");
   }
@@ -1548,18 +1548,18 @@ double Rec2DData::getGlobalQuality(int numVert, double valVert,
                                    Rec2DQualCrit crit          )
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-  
+
   switch (crit) {
     case BlossomQuality :
       return _cur->_0blossomQuality;
-      
+
     case VertQuality :
       return (static_cast<double>(_cur->_1valVert) + valVert) / (_cur->_numVert + numVert);
-    
+
     case VertEdgeQuality :
       return (static_cast<double>(_cur->_2valVert) + valVert) / (_cur->_numVert + numVert)
              *(static_cast<double>(_cur->_2valEdge) + valEdge) / (_cur->_numEdge + numEdge);
-    
+
     default :
       Msg::Error("[Rec2DData:getGlobalQuality] Unknown quality criterion");
   }
@@ -1572,11 +1572,11 @@ void Rec2DData::updateVertQual(double val, Rec2DQualCrit crit)
     case VertQuality :
       _cur->_1valVert += val;
       return;
-    
+
     case VertEdgeQuality :
       _cur->_2valVert += val;
       return;
-    
+
     default :
       Msg::Error("[Rec2DData:updateVertQual] Unknown quality criterion");
   }
@@ -1995,13 +1995,13 @@ Rec2DChange::Rec2DChange(Rec2DVertex *rv,
       for (unsigned int i = 0; i < elem.size(); ++i)
         rv->add(elem[i]);
       break;
-      
+
     case RemoveElem :
       *vect = elem;
       for (int i = (int)elem.size()-1; i > -1; --i)
         rv->rmv(elem[i]);
       break;
-      
+
     default :
       delete vect;
       _type = Error;
@@ -2136,39 +2136,39 @@ void Rec2DChange::revert()
       Rec2DData::addBlosQual(-*(int*)_entity);
       delete (int*)_entity;
       break;
-      
+
     case HideEdge :
       ((Rec2DEdge*)_entity)->reveal();
       break;
-      
+
     case HideVertex :
       ((Rec2DVertex*)_entity)->reveal();
       break;
-      
+
     case HideElement :
       ((Rec2DElement*)_entity)->reveal();
       break;
-      
+
     case CreatedEdge :
       delete (Rec2DEdge*)_entity;
       break;
-      
+
     case CreatedVertex :
       delete (Rec2DVertex*)_entity;
       break;
-      
+
     case CreatedElement :
       delete (Rec2DElement*)_entity;
       break;
-      
+
     case HideAction :
       ((Rec2DAction*)_entity)->reveal();
       break;
-      
+
     case CreatedAction :
       delete (Rec2DAction*)_entity;
       break;
-      
+
     case HideActions :
       {
         std::vector<Rec2DAction*> *vect = (std::vector<Rec2DAction*>*)_entity;
@@ -2177,7 +2177,7 @@ void Rec2DChange::revert()
         delete vect;
       }
       break;
-      
+
     case CreatedActions :
       {
         std::vector<Rec2DAction*> *vect = (std::vector<Rec2DAction*>*)_entity;
@@ -2186,7 +2186,7 @@ void Rec2DChange::revert()
         delete vect;
       }
       break;
-      
+
     case SwapEdgeInAction :
       {
         std::vector<Rec2DAction*> *vect = (std::vector<Rec2DAction*>*)_entity;
@@ -2198,7 +2198,7 @@ void Rec2DChange::revert()
         delete pairEdge;
       }
       break;
-      
+
     case SwapEdgeInElem :
       {
         std::pair<Rec2DEdge*, Rec2DEdge*> *pairEdge;
@@ -2207,7 +2207,7 @@ void Rec2DChange::revert()
         delete pairEdge;
       }
       break;
-      
+
     case SwapVertInAction :
       {
         std::vector<Rec2DAction*> *vect = (std::vector<Rec2DAction*>*)_entity;
@@ -2219,7 +2219,7 @@ void Rec2DChange::revert()
         delete pairVert;
       }
       break;
-      
+
     case SwapVertInEdge :
       {
         std::vector<Rec2DEdge*> *edges = (std::vector<Rec2DEdge*>*)_entity;
@@ -2231,7 +2231,7 @@ void Rec2DChange::revert()
         delete pairVert;
       }
       break;
-      
+
     case SwapMVertInElement :
       {
         std::vector<Rec2DElement*> *elem = (std::vector<Rec2DElement*>*)_entity;
@@ -2243,7 +2243,7 @@ void Rec2DChange::revert()
         delete pairVert;
       }
       break;
-      
+
     case RemoveElem :
       {
         std::vector<Rec2DElement*> *elem = (std::vector<Rec2DElement*>*)_info;
@@ -2252,7 +2252,7 @@ void Rec2DChange::revert()
         delete elem;
       }
       break;
-      
+
     case AddElem :
       {
         std::vector<Rec2DElement*> *elem = (std::vector<Rec2DElement*>*)_info;
@@ -2261,17 +2261,17 @@ void Rec2DChange::revert()
         delete elem;
       }
       break;
-      
+
     case Relocate :
       ((Rec2DVertex*)_entity)->relocate(*(SPoint2*)_info);
       delete (SPoint2*)_info;
       break;
-      
+
     case ChangePar :
       ((Rec2DVertex*)_entity)->setParity(*(int*)_info);
       delete (int*)_info;
       break;
-      
+
     case SavePar :
       {
         std::vector<Rec2DVertex*> *verts = (std::vector<Rec2DVertex*>*)_entity;
@@ -2282,15 +2282,15 @@ void Rec2DChange::revert()
         delete parities;
       }
       break;
-      
+
     case Error :
       Msg::Error("[Rec2DChange] There was an error");
       return;
-      
+
     case Reverted :
       Msg::Error("[Rec2DChange] Multiple revert");
       return;
-      
+
     default :
       Msg::Error("[Rec2DChange] Unknown type (%d)", _type);
       return;
@@ -2383,7 +2383,7 @@ double Rec2DAction::getReward() const
 {
   if (_lastUpdate < Recombine2D::getNumChange())
     ((Rec2DAction*)this)->_computeGlobQual();
-  
+
   return _globQualIfExecuted/* - Rec2DData::getGlobalQuality()*/;
 }
 
@@ -2434,7 +2434,7 @@ Rec2DTwoTri2Quad::Rec2DTwoTri2Quad(Rec2DElement *el0, Rec2DElement *el1)
   _triangles[0] = el0;
   _triangles[1] = el1;
   _edges[4] = Rec2DElement::getCommonEdge(el0, el1);
-  
+
   // get edges
   std::vector<Rec2DEdge*> edges;
   el0->getMoreEdges(edges);
@@ -2457,7 +2457,7 @@ Rec2DTwoTri2Quad::Rec2DTwoTri2Quad(Rec2DElement *el0, Rec2DElement *el1)
     _edges[2] = _edges[3];
     _edges[3] = re;
   }
-  
+
   // get vertices
   _vertices[0] = _edges[4]->getVertex(0);
   _vertices[1] = _edges[4]->getVertex(1);
@@ -2469,14 +2469,14 @@ Rec2DTwoTri2Quad::Rec2DTwoTri2Quad(Rec2DElement *el0, Rec2DElement *el1)
     _vertices[0] = _vertices[1];
     _vertices[1] = rv;
   }
-  
+
   //
   _rt = new RecombineTriangle(MEdge(_vertices[0]->getMVertex(),
                                     _vertices[1]->getMVertex() ),
                               _triangles[0]->getMElement(),
                               _triangles[1]->getMElement()       );
   reveal();
-  
+
   if (!edgesAreInOrder(_edges, 4)) Msg::Error("recomb |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
 }
 
@@ -2511,7 +2511,7 @@ void Rec2DTwoTri2Quad::hide()
 }
 
 void Rec2DTwoTri2Quad::reveal()
-{ 
+{
   if (_triangles[0])
     _triangles[0]->add(this);
   if (_triangles[1])
@@ -2540,7 +2540,7 @@ void Rec2DTwoTri2Quad::apply(std::vector<Rec2DVertex*> &newPar)
     Msg::Error("[Rec2DTwoTri2Quad] No way ! I won't apply ! Find someone else...");
     return;
   }
-  
+
   int min = Rec2DData::getNewParity(), index = -1;
   for (int i = 0; i < 4; ++i) {
     if (_vertices[i]->getParity() && min > _vertices[i]->getParity()) {
@@ -2570,25 +2570,25 @@ void Rec2DTwoTri2Quad::apply(std::vector<Rec2DVertex*> &newPar)
       }
     }
   }
-  
+
   _triangles[0]->rmv(this);
   _triangles[1]->rmv(this);
   // hide() instead
-  
+
   std::vector<Rec2DAction*> actions;
   _triangles[0]->getMoreUniqueActions(actions);
   _triangles[1]->getMoreUniqueActions(actions);
   for (unsigned int i = 0; i < actions.size(); ++i)
     delete actions[i];
-  
+
   delete _triangles[0];
   delete _triangles[1];
   _triangles[0] = NULL;
   _triangles[1] = NULL;
   delete _edges[4];
-  
+
   new Rec2DElement((MQuadrangle*)NULL, (const Rec2DEdge**)_edges);
-  
+
   Recombine2D::incNumChange();*/
 }
 
@@ -2727,7 +2727,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
     else Msg::Info("no edge");
     return false;
   }
-  
+
   std::vector<Rec2DEdge*> edges;
   Rec2DEdge *re[4];
   _triangles[0]->getMoreEdges(edges);
@@ -2761,7 +2761,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
       return false;
     }
   }
-  
+
   if (_edges[0]->getOtherVertex(_vertices[2]) == _edges[4]->getVertex(0)) {
     if (_vertices[0] != _edges[4]->getVertex(0) || _vertices[1] != _edges[4]->getVertex(1)) {
       Msg::Error("inco action [2], |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
@@ -2782,7 +2782,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
     Msg::Error("inco action [5], |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
     return false;
   }
-  
+
   const Rec2DAction *ra;
   if (action) ra = action;
   else ra = this;
@@ -2790,7 +2790,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
     Msg::Error("inco action [6], |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
     return false;
   }
-  
+
   if (isObsolete()) {
     int p[4];
     p[0] = _vertices[0]->getParity();
@@ -2801,7 +2801,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
     Msg::Error("inco action [7], |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
     return false;
   }
-  
+
   return true;
 }
 
@@ -2825,7 +2825,7 @@ void Rec2DTwoTri2Quad::printReward() const
     double valEdge2 = 0;
     for (int i = 0; i < 4; ++i)
       valEdge2 += _edges[i]->getQual();
-    
+
     double valVert;
     valVert = _vertices[0]->getGainRecomb(_triangles[0], _triangles[1]);
     valVert += _vertices[1]->getGainRecomb(_triangles[0], _triangles[1]);
@@ -2921,7 +2921,7 @@ void Rec2DTwoTri2Quad::_computeGlobQual()
                                             _edges[4], _edges[1], _edges[2]);
     _valVert += _vertices[2]->getGainQuad(_triangles[0], _edges[0], _edges[1]);
     _valVert += _vertices[3]->getGainQuad(_triangles[1], _edges[2], _edges[3]);
-    
+
     _globQualIfExecuted = Rec2DData::getGlobalQuality(0, _valVert);
     _lastUpdate = Recombine2D::getNumChange();
     return;
@@ -2930,13 +2930,13 @@ void Rec2DTwoTri2Quad::_computeGlobQual()
     double valEdge = -Recombine2D::getWeightEdgeBase() * _edges[4]->getQual();
     for (int i = 0; i < 4; ++i)
       valEdge += Recombine2D::getWeightEdgeQuad() * _edges[i]->getQual();
-    
+
     if (_vertices[0]->getLastUpdate() > _lastUpdate ||
         _vertices[1]->getLastUpdate() > _lastUpdate   ) {
       _valVert = _vertices[0]->getGainRecomb(_triangles[0], _triangles[1]);
       _valVert += _vertices[1]->getGainRecomb(_triangles[0], _triangles[1]);
     }
-    
+
     double w = 4*Recombine2D::getWeightEdgeQuad()
                - Recombine2D::getWeightEdgeBase();
     _globQualIfExecuted = Rec2DData::getGlobalQuality(0, _valVert, w, valEdge);
@@ -2954,7 +2954,7 @@ void Rec2DTwoTri2Quad::_computeReward()
     case BlossomQuality :
       _reward = (int)_rt->total_gain;
       return;
-      
+
     case VertQuality :
       _valVert = .0;
       _valVert += _vertices[0]->getGainRecomb(_triangles[0], _triangles[1],
@@ -2963,33 +2963,33 @@ void Rec2DTwoTri2Quad::_computeReward()
                                               _edges[4], _edges[1], _edges[2]);
       _valVert += _vertices[2]->getGainQuad(_triangles[0], _edges[0], _edges[1]);
       _valVert += _vertices[3]->getGainQuad(_triangles[1], _edges[2], _edges[3]);
-      
+
       _reward = Rec2DData::getGlobalQuality(0, _valVert)
                 - Rec2DData::getGlobalQuality();
       _lastUpdate = Recombine2D::getNumChange();
       return;
-    
+
     case VertEdgeQuality :
     {
       double valEdge = -Recombine2D::getWeightEdgeBase() * _edges[4]->getQual();
       for (int i = 0; i < 4; ++i)
         valEdge += Recombine2D::getWeightEdgeQuad() * _edges[i]->getQual();
-      
+
       if (_vertices[0]->getLastUpdate() > _lastUpdate ||
           _vertices[1]->getLastUpdate() > _lastUpdate   ) {
         _valVert = _vertices[0]->getGainRecomb(_triangles[0], _triangles[1]);
         _valVert += _vertices[1]->getGainRecomb(_triangles[0], _triangles[1]);
       }
-      
+
       double w = 4*Recombine2D::getWeightEdgeQuad()
                  - Recombine2D::getWeightEdgeBase();
       _reward = Rec2DData::getGlobalQuality(0, _valVert, w, valEdge)
                 - Rec2DData::getGlobalQuality();
-      
+
       _lastUpdate = Recombine2D::getNumChange();
       return;
     }
-    
+
     default :
       Msg::Error("[Rec2DTwoTri2Quad:_computeReward] Unknown quality criterion %d", crit);
   }
@@ -3146,7 +3146,7 @@ void Rec2DCollapse::apply(Rec2DDataChange *rdc,
                   _rec->_edges[1]->getVertex(1) == vKO   ;
   rdc->swapFor(vKO, vOK);
   rdc->hide(vKO);
-  
+
   int i0, i1, i2, i3;
   if (edge12KO) {
     i0 = 1; i1 = 2;
@@ -3191,7 +3191,7 @@ void Rec2DCollapse::apply(Rec2DDataChange *rdc,
       }
     }
   }
-  
+
   int parKO, parOK;
   if ((parKO = vKO->getParity())) {
     if (!(parOK = vOK->getParity()))
@@ -3199,7 +3199,7 @@ void Rec2DCollapse::apply(Rec2DDataChange *rdc,
     else if (parOK/2 != parKO/2)
       Rec2DData::associateParity(std::max(parOK, parKO), std::min(parOK, parKO), rdc);
   }
-  
+
   rdc->checkObsoleteActions(_rec->_vertices, 4);
 }
 
@@ -3226,7 +3226,7 @@ void Rec2DCollapse::printReward() const
     _rec->_vertices[1]->getParam(&p[1]);
     int b0 = _rec->_vertices[0]->getOnBoundary();
     int b1 = _rec->_vertices[1]->getOnBoundary();
-    
+
     double valVert = .0;
     if (b0 || b1) {
       int iOK = 1, iKO = 0;
@@ -3237,22 +3237,22 @@ void Rec2DCollapse::printReward() const
       double oldValVert = Rec2DData::getSumVert();
       _rec->_vertices[iKO]->relocate(p[iOK]);
       double qualRelocation = Rec2DData::getSumVert() - oldValVert;
-      
+
       valVert += _rec->_vertices[iOK]->getGainMerge(_rec->_vertices[iKO],
                                                     &_rec->_edges[1], 2  );
       valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[1]);
       valVert += _rec->_vertices[3]->getGainTriLess(_rec->_edges[2]);
-      
+
       for (int i = 0; i < 4; ++i) {
         Msg::Info("vert %d : %g", _rec->_vertices[i]->getNum(), _rec->_vertices[i]->getQual());
       }
-      
+
       Msg::Info("qual col %g %g %g %g", qualRelocation,
                 _rec->_vertices[iOK]->getGainMerge(_rec->_vertices[iKO], &_rec->_edges[1], 2),
                 _rec->_vertices[2]->getGainTriLess(_rec->_edges[1]),
                 _rec->_vertices[3]->getGainTriLess(_rec->_edges[2])
                );
-      
+
       _rec->_vertices[iKO]->relocate(p[iKO]);
     }
     else {
@@ -3263,22 +3263,22 @@ void Rec2DCollapse::printReward() const
       _rec->_vertices[0]->relocate(pNew);
       _rec->_vertices[1]->relocate(pNew);
       double qualRelocation = Rec2DData::getSumVert() - oldValVert;
-      
+
       valVert += _rec->_vertices[0]->getGainMerge(_rec->_vertices[1],
                                                   &_rec->_edges[1], 2);
-      valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[0]); //FIX normal ? 
+      valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[0]); //FIX normal ?
       valVert += _rec->_vertices[3]->getGainTriLess(_rec->_edges[2]);
-      
+
       for (int i = 0; i < 4; ++i) {
         Msg::Info("vert %d : %g", _rec->_vertices[i]->getNum(), _rec->_vertices[i]->getQual());
       }
-      
+
       Msg::Info("qual col %g %g %g %g", qualRelocation,
                 _rec->_vertices[0]->getGainMerge(_rec->_vertices[1], &_rec->_edges[1], 2),
                 _rec->_vertices[2]->getGainTriLess(_rec->_edges[1]),
                 _rec->_vertices[3]->getGainTriLess(_rec->_edges[2])
                );
-      
+
       _rec->_vertices[0]->relocate(p[0]);
       _rec->_vertices[1]->relocate(p[1]);
     }
@@ -3311,7 +3311,7 @@ void Rec2DCollapse::printReward() const
       }
       if (toAdd) verts.push_back(v);
     }
-    
+
     _rec->_vertices[0]->getMoreUniqueEdges(edges);
     _rec->_vertices[1]->getMoreUniqueEdges(edges);
     int numEdgeBef = edges.size(), weightEdgeBef = 0;
@@ -3320,7 +3320,7 @@ void Rec2DCollapse::printReward() const
       valEdgeBef += edges[i]->getWeightedQual();
       weightEdgeBef += edges[i]->getWeight();
     }
-    
+
     int numVertOther = verts.size();
     double vert01Bef = 0, vert23Bef = 0, vertOtherBef = 0;
     vert01Bef += _rec->_vertices[0]->getQual();
@@ -3330,10 +3330,10 @@ void Rec2DCollapse::printReward() const
     for (unsigned int i = 0; i < verts.size(); ++i) {
       vertOtherBef += verts[i]->getQual();
     }
-    
+
     Rec2DNode *n = new Rec2DNode(NULL, (Rec2DAction*)this, 0);
     n->makeChanges();
-    
+
     edges.clear();
     _rec->_vertices[0]->getMoreUniqueEdges(edges);
     _rec->_vertices[1]->getMoreUniqueEdges(edges);
@@ -3343,7 +3343,7 @@ void Rec2DCollapse::printReward() const
       valEdgeAft += edges[i]->getWeightedQual();
       weightEdgeAft += edges[i]->getWeight();
     }
-    
+
     double vert01Aft = 0, vert23Aft = 0, vertOtherAft = 0;
     if (_rec->_vertices[0]->getNumElements())
       vert01Aft += _rec->_vertices[0]->getQual();
@@ -3354,10 +3354,10 @@ void Rec2DCollapse::printReward() const
     for (unsigned int i = 0; i < verts.size(); ++i) {
       vertOtherAft += verts[i]->getQual();
     }
-    
+
     n->revertChanges();
     delete n;
-    
+
     Msg::Info("-(%d)%de%g +(%d)%de%g "
               "-4v%g +2v%g +0v%g +(%d)0v%g",
               numEdgeBef, weightEdgeBef, valEdgeBef/weightEdgeBef,
@@ -3385,13 +3385,13 @@ void Rec2DCollapse::_computeGlobQual()
     _lastUpdate = Recombine2D::getNumChange();
     return;
   }
-  
+
   SPoint2 p[2];
   _rec->_vertices[0]->getParam(&p[0]);
   _rec->_vertices[1]->getParam(&p[1]);
   int b0 = _rec->_vertices[0]->getOnBoundary();
   int b1 = _rec->_vertices[1]->getOnBoundary();
-  
+
   if (Recombine2D::blossomQual()) {
     Msg::Error("[Rec2DCollapse] Don't know");
     //?return (double)_cur->_blossomQuality;
@@ -3406,13 +3406,13 @@ void Rec2DCollapse::_computeGlobQual()
         iKO = 1;
       }
       _rec->_vertices[iKO]->relocate(p[iOK]);
-      
+
       valVert += _rec->_vertices[iOK]->getGainMerge(_rec->_vertices[iKO],
                                                     &_rec->_edges[1], 2  );
       valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[1]);
       valVert += _rec->_vertices[3]->getGainTriLess(_rec->_edges[2]);
       _globQualIfExecuted = Rec2DData::getGlobalQuality(-1, valVert);
-      
+
       _rec->_vertices[iKO]->relocate(p[iKO]);
     }
     else {
@@ -3421,13 +3421,13 @@ void Rec2DCollapse::_computeGlobQual()
       SPoint2 pNew(u, v);
       _rec->_vertices[0]->relocate(pNew);
       _rec->_vertices[1]->relocate(pNew);
-      
+
       valVert += _rec->_vertices[0]->getGainMerge(_rec->_vertices[1],
                                                   &_rec->_edges[1], 2);
       valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[0]);
       valVert += _rec->_vertices[3]->getGainTriLess(_rec->_edges[2]);
       _globQualIfExecuted = Rec2DData::getGlobalQuality(-1, valVert);
-      
+
       _rec->_vertices[0]->relocate(p[0]);
       _rec->_vertices[1]->relocate(p[1]);
     }
@@ -3444,7 +3444,7 @@ void Rec2DCollapse::_computeGlobQual()
         iKO = 1;
       }
       _rec->_vertices[iKO]->relocate(p[iOK]);
-      
+
       valVert += _rec->_vertices[2]->getGainOneElemLess();
       valVert += _rec->_vertices[3]->getGainOneElemLess();
       valVert += _rec->_vertices[iOK]->getGainMerge(_rec->_vertices[iKO]);
@@ -3453,10 +3453,10 @@ void Rec2DCollapse::_computeGlobQual()
       numEdge -= 2 * Recombine2D::getWeightEdgeBase();
       valEdge -= _rec->_edges[4]->getWeightedQual();
       numEdge -= _rec->_edges[4]->getWeight();
-      
+
       _globQualIfExecuted = Rec2DData::getGlobalQuality(-1, valVert,
                                                         numEdge, valEdge);
-      
+
       _rec->_vertices[iKO]->relocate(p[iKO]);
     }
     else {
@@ -3465,7 +3465,7 @@ void Rec2DCollapse::_computeGlobQual()
       SPoint2 pNew(u, v);
       _rec->_vertices[0]->relocate(pNew);
       _rec->_vertices[1]->relocate(pNew);
-      
+
       valVert += _rec->_vertices[2]->getGainOneElemLess();
       valVert += _rec->_vertices[3]->getGainOneElemLess();
       valVert += _rec->_vertices[0]->getGainMerge(_rec->_vertices[1]);
@@ -3474,10 +3474,10 @@ void Rec2DCollapse::_computeGlobQual()
       numEdge -= 2 * Recombine2D::getWeightEdgeBase();
       valEdge -= _rec->_edges[4]->getWeightedQual();
       numEdge -= _rec->_edges[4]->getWeight();
-      
+
       _globQualIfExecuted = Rec2DData::getGlobalQuality(-1, valVert,
                                                         numEdge, valEdge);
-      
+
       _rec->_vertices[0]->relocate(p[0]);
       _rec->_vertices[1]->relocate(p[1]);
     }
@@ -3597,7 +3597,7 @@ void Rec2DEdge::updateQual()
   double diffQual = _qual;
   _computeQual();
   diffQual = _weight*(_qual-diffQual);
-  
+
   _rv0->updateWAQualEdges(diffQual);
   _rv1->updateWAQualEdges(diffQual);
   Rec2DData::updateEdgeQual(diffQual);
@@ -3631,7 +3631,7 @@ bool Rec2DEdge::checkCoherence() const
 {
   if (_rv0 == _rv1) return false;
   if (!_rv0->has(this) || !_rv1->has(this)) return false;
-  
+
   Rec2DElement *elem[2];
   Rec2DEdge::getElements(this, elem);
   if (elem[1]) {
@@ -3655,7 +3655,7 @@ void Rec2DEdge::print() const
     a = elem[0]->getNum();
   if (elem[1])
     b = elem[1]->getNum();
-  
+
   Msg::Info(" edge , %d--%d , %d/%d", _rv0->getNum(), _rv1->getNum(), a, b);
 }
 
@@ -3665,7 +3665,7 @@ void Rec2DEdge::_computeQual()
   double adimLength = _straightAdimLength();
   if (adimLength > 1)
     adimLength = 1./adimLength;
-  
+
   _qual = (Recombine2D::getCoefLengOrientQual() * alignment
            + Recombine2D::getCoefLengthQual()              ) * adimLength
           + Recombine2D::getCoefOrientQual() * alignment;
@@ -3682,7 +3682,7 @@ void Rec2DEdge::_addWeight(int w)
   if (_weight < Recombine2D::getWeightEdgeBase()) {
     Msg::Error("[Rec2DEdge] Weight too low");
   }
-  
+
   double diffQual = w*getQual();
   _rv0->updateWAQualEdges(diffQual, w);
   _rv1->updateWAQualEdges(diffQual, w);
@@ -3700,10 +3700,10 @@ double Rec2DEdge::_straightAdimLength() const
   double length = sqrt(dx * dx + dy * dy + dz * dz);
   delete[] xyz0;
   delete[] xyz1;
-  
+
   double lc0 = (*Recombine2D::bgm())(_rv0->u(), _rv0->v(), .0);
   double lc1 = (*Recombine2D::bgm())(_rv1->u(), _rv1->v(), .0);
-  
+
   return length * (1./lc0 + 1./lc1) / 2.;
 }
 
@@ -3712,17 +3712,17 @@ double Rec2DEdge::_straightAlignment() const
   double angle0 = Recombine2D::bgm()->getAngle(_rv0->u(), _rv0->v(), .0);
   double angle1 = Recombine2D::bgm()->getAngle(_rv1->u(), _rv1->v(), .0);
   double angleEdge = atan2(_rv0->v()-_rv1->v(), _rv0->u()-_rv1->u());
-  
+
   double alpha0 = angleEdge - angle0;
   double alpha1 = angleEdge - angle1;
   crossField2d::normalizeAngle(alpha0);
   crossField2d::normalizeAngle(alpha1);
   alpha0 = 1. - 4. * std::min(alpha0, .5 * M_PI - alpha0) / M_PI;
   alpha1 = 1. - 4. * std::min(alpha1, .5 * M_PI - alpha1) / M_PI;
-  
+
   double lc0 = (*Recombine2D::bgm())(_rv0->u(), _rv0->v(), .0);
   double lc1 = (*Recombine2D::bgm())(_rv1->u(), _rv1->v(), .0);
-  
+
   return (alpha0/lc0 + alpha1/lc1) / (1./lc0 + 1./lc1);
 }
 
@@ -3751,13 +3751,13 @@ Rec2DVertex::Rec2DVertex(Rec2DVertex *rv, double ang)
   _elements(rv->_elements), _param(rv->_param), _pos(-1)
 {
   rv->hide(false);
-  
+
   // swap the two vertices in edges
   for (unsigned int i = 0; i < _edges.size(); ++i) {
     _edges[i]->swap(rv, this, false);
   }
   rv->_edges.clear();
-  
+
   // swap the two vertices in actions
   std::vector<Rec2DAction*> actions;
   for (unsigned int i = 0; i < _elements.size(); ++i) {
@@ -3767,7 +3767,7 @@ Rec2DVertex::Rec2DVertex(Rec2DVertex *rv, double ang)
     if (actions[i]->isRecomb()) actions[i]->swap(rv, this);
   }
   rv->_elements.clear();
-  
+
   // end
   reveal();
   delete rv;
@@ -3785,7 +3785,7 @@ void Rec2DVertex::hide(bool check)
     Msg::Error("[Rec2DVertex] I have %d elements and %d edges", _elements.size(), _edges.size());
   if (_parity)
     Rec2DData::removeParity(this, _parity);
-  
+
   Rec2DData::rmv(this);
 }
 
@@ -3793,7 +3793,7 @@ void Rec2DVertex::reveal()
 {
   if (_parity)
     Rec2DData::addParity(this, _parity);
-  
+
   Rec2DData::add(this);
 }
 
@@ -3803,7 +3803,7 @@ void Rec2DVertex::initStaticTable()
   // _gains[onWhat][numEl];     onWhat={0:edge,1:face} (earning of adding an element)
   if (_qualVSnum == NULL) {
     int nE = 10, nF = 20; //edge, face
-    
+
     _qualVSnum = new double*[2];
     _qualVSnum[0] = new double[nE];
     _qualVSnum[1] = new double[nF];
@@ -3813,7 +3813,7 @@ void Rec2DVertex::initStaticTable()
       _qualVSnum[0][i] = 1. - fabs(2./i - 1.);
     for (int i = 1; i < nF; ++i)
       _qualVSnum[1][i] = std::max(1. - fabs(4./i - 1.), .0);
-      
+
     _gains = new double*[2];
     _gains[0] = new double[nE-1];
     _gains[1] = new double[nF-1];
@@ -3832,14 +3832,14 @@ void Rec2DVertex::add(const Rec2DEdge *re)
       return;
     }
   }
-  
+
   double oldQual = getQual(VertQuality);
-  
+
   _edges.push_back(const_cast<Rec2DEdge*>(re));
   _sumWQualEdge += re->getWeightedQual();
   _sumWeightEdge += re->getWeight();
   _lastUpdate = Recombine2D::getNumChange();
-  
+
   Rec2DData::updateVertQual(getQual(VertQuality)-oldQual, VertQuality);
 }
 
@@ -3856,9 +3856,9 @@ void Rec2DVertex::rmv(const Rec2DEdge *re)
   unsigned int i = 0;
   while (i < _edges.size()) {
     if (_edges[i] == re) {
-      
+
       double oldQual = getQual(VertQuality);
-      
+
       _edges[i] = _edges.back();
       _edges.pop_back();
       _sumWQualEdge -= re->getWeightedQual();
@@ -3866,7 +3866,7 @@ void Rec2DVertex::rmv(const Rec2DEdge *re)
       if (_sumWeightEdge < 0 || _sumWQualEdge < -1e12)
         Msg::Error("[Rec2DVertex] Negative sum edge %d %g", _sumWeightEdge, _sumWQualEdge);
       _lastUpdate = Recombine2D::getNumChange();
-      
+
       Rec2DData::updateVertQual(getQual(VertQuality)-oldQual, VertQuality);
       return;
     }
@@ -3883,15 +3883,15 @@ void Rec2DVertex::add(const Rec2DElement *rel)
       return;
     }
   }
-  
+
   double oldQual1 = getQual(VertQuality);
   double oldQual2 = getQual(VertEdgeQuality);
-  
+
   _elements.push_back(const_cast<Rec2DElement*>(rel));
   _sumWeightAngle += rel->getAngleWeight();
   _sumWQualAngle += rel->getWeightedAngleQual(this);
   _lastUpdate = Recombine2D::getNumChange();
-  
+
   Rec2DData::updateVertQual(getQual(VertQuality)-oldQual1, VertQuality);
   Rec2DData::updateVertQual(getQual(VertEdgeQuality)-oldQual2, VertEdgeQuality);
 }
@@ -3910,16 +3910,16 @@ void Rec2DVertex::rmv(const Rec2DElement *rel)
   unsigned int i = 0;
   while (i < _elements.size()) {
     if (_elements[i] == rel) {
-      
+
       double oldQual1 = getQual(VertQuality);
       double oldQual2 = getQual(VertEdgeQuality);
-      
+
       _sumWeightAngle -= _elements[i]->getAngleWeight();
       _sumWQualAngle -= _elements[i]->getWeightedAngleQual(this);
       _elements[i] = _elements.back();
       _elements.pop_back();
       _lastUpdate = Recombine2D::getNumChange();
-      
+
       Rec2DData::updateVertQual(getQual(VertQuality)-oldQual1, VertQuality);
       Rec2DData::updateVertQual(getQual(VertEdgeQuality)-oldQual2, VertEdgeQuality);
       return;
@@ -3991,7 +3991,7 @@ void Rec2DVertex::setOnBoundary()
     Rec2DData::updateVertQual(getQual(VertEdgeQuality)-oldQual2, VertEdgeQuality);
     _lastUpdate = Recombine2D::getNumChange();
   }
-  
+
 }
 
 void Rec2DVertex::setParity(int p, bool tree)
@@ -4000,7 +4000,7 @@ void Rec2DVertex::setParity(int p, bool tree)
     //Msg::Warning("[Rec2DVertex] I don't like to do it. Think about that !");
     Rec2DData::removeParity(this, _parity);
   }
-  
+
   if ((_parity = p))
     Rec2DData::addParity(this, _parity);
 #ifdef REC2D_DRAW
@@ -4018,7 +4018,7 @@ void Rec2DVertex::setParityWD(int pOld, int pNew)
   if (pOld != _parity)
     Msg::Error("[Rec2DVertex] Old parity was not correct");
   _parity = pNew;
-  
+
 #ifdef REC2D_DRAW
   if (_v)
     _v->setIndex(_parity);
@@ -4061,13 +4061,13 @@ double Rec2DVertex::getGainDegree(int n) const
 {
   if (!n)
     return .0;
-  int numElem = (int)_elements.size();  
+  int numElem = (int)_elements.size();
   if (numElem + n < 0) {
     Msg::Error("[Rec2DVertex] gain for %d elements not available",
                numElem + n                             );
     return .0;
   }
-  
+
   if (_onWhat > -1) {
     switch (n) {
       case 1 :
@@ -4079,17 +4079,17 @@ double Rec2DVertex::getGainDegree(int n) const
                - _qualVSnum[_onWhat][numElem-1];
     }
   }
-  
+
   if (numElem == 0) {
     Msg::Error("[Rec2DVertex] I don't want this anymore !");
     return 11. - fabs(2./M_PI * _angle/(double)(numElem + n) - 1.);
   }
-  
+
   if (numElem + n == 0) {
     Msg::Error("[Rec2DVertex] I don't want this anymore !");
     return fabs(2./M_PI * _angle/(double)numElem - 1.) - 11.;
   }
-  
+
   return fabs(2./M_PI * _angle/(double)numElem - 1.)
          - fabs(2./M_PI * _angle/(double)(numElem + n) - 1.);
 }
@@ -4097,14 +4097,14 @@ double Rec2DVertex::getGainDegree(int n) const
 double Rec2DVertex::getQual(Rec2DQualCrit crit) const
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-  
+
   switch (crit) {
     case VertQuality :
       return _vertQual() * _WAQualEdges();
-    
+
     case VertEdgeQuality :
       return _vertQual();
-    
+
     default :
       Msg::Error("[Rec2DVertex:getQual-1] Unknown quality criterion %d", crit);
       Msg::Error("");
@@ -4118,17 +4118,17 @@ double Rec2DVertex::getQual(double waQualAngles, double waQualEdges,
                             int numElem, Rec2DQualCrit crit) const
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-    
+
   static int a = 0;
   if (++a == 1) Msg::Warning("FIXME NoCrit==-2, ChoosedCrit==-1");
-  
+
   switch (crit) {
     case VertQuality :
       return _vertQual(_qualDegree(numElem), waQualAngles) * waQualEdges;
-    
+
     case VertEdgeQuality :
       return _vertQual(_qualDegree(numElem), waQualAngles);
-    
+
     default :
       Msg::Error("[Rec2DVertex:getQual-2] Unknown quality criterion %d", crit);
   }
@@ -4142,13 +4142,13 @@ double Rec2DVertex::/*vertQual_*/getGainQuad(const Rec2DElement *rel,
   double wa = Recombine2D::getWeightAngleQuad()
              - Recombine2D::getWeightAngleTri();
   double wq = Recombine2D::getWeightEdgeQuad();
-  
+
   double qualAngle = _sumWQualAngle + wa * rel->getAngleQual(this) ;
   int sumAngle = _sumWeightAngle + wa;
-  
+
   double qualEdge = _sumWQualEdge + wq * re0->getQual() + wq * re1->getQual();
   int sumEdge = _sumWeightEdge + 2*wq;
-  
+
   return getQual(qualAngle/sumAngle, qualEdge/sumEdge,
                  (int)_elements.size()                ) - getQual();
 }
@@ -4173,37 +4173,37 @@ double Rec2DVertex::getGainRecomb(/*Rec2DQualCrit crit,*/
     Msg::Error("[Rec2DVertex] Cannot compute gain of recombination if elements aren't triangles");
     return -1.;
   }
-  
+
   //if (crit == BlossomQuality) return .0;
   //if (crit < 0) {
     Msg::Warning("[Rec2DVertex] Give me another criterion please.");
   // }
-  
+
   double swQualAngle = _sumWQualAngle, swQualEdge = _sumWQualEdge;
   int swAngle = _sumWeightAngle, swEdge = _sumWeightEdge;
-  
+
   double wat = Recombine2D::getWeightAngleTri(),
          waq = Recombine2D::getWeightAngleQuad(),
          weq = Recombine2D::getWeightEdgeQuad(),
          web = Recombine2D::getWeightEdgeBase();
-  
+
   swQualAngle -= wat * rel1->getAngleQual(this);
   swQualAngle -= wat * rel2->getAngleQual(this);
   swQualAngle += waq * Recombine2D::angle2qual(rel1->getAngle(this)
                                              + rel2->getAngle(this));
   swAngle += waq - 2 * wat;
-  
+
   if (re2) {
     swQualEdge -= web * re0->getQual();
     swQualEdge += weq * re1->getQual();
     swQualEdge += weq * re2->getQual();
     swEdge += 2 * weq - web;
   }
-  
+
   return getQual(swQualAngle / swAngle, swQualEdge / swEdge,
                  static_cast<int>(_elements.size())-1/*, crit*/)
          - getQual(/*crit*/);
-         
+
   //FIX verifier que c'est bien ce qui est demande ! (renvoie bien ce que veux apply, compute reward, ...)
 }
 
@@ -4253,7 +4253,7 @@ double Rec2DVertex::/*vertQual_*/getGainMerge(const Rec2DVertex *rv,
     sumQualAngle += qualAngle[i];
   }
   int numElem = _elements.size() + rv->_elements.size() - 4;
-  
+
   int sumEdge = 0;
   double sumQualEdge = .0;
   for (unsigned int i = 0; i < _edges.size(); ++i) {
@@ -4268,7 +4268,7 @@ double Rec2DVertex::/*vertQual_*/getGainMerge(const Rec2DVertex *rv,
     sumEdge -= Recombine2D::getWeightEdgeBase();
     sumQualEdge -= Recombine2D::getWeightEdgeBase() * edges[i]->getQual();
   }
-  
+
   return Rec2DVertex::getQual(sumQualAngle/sumAngle,
                               sumQualEdge/sumEdge, numElem)
          - getQual() - rv->getQual()                        ;
@@ -4307,8 +4307,8 @@ double Rec2DVertex::/*vertEdgeQual_*/getGainMerge(const Rec2DVertex *rv) const
     sumQualAngle += qualAngle[i];
     sumAngle += angleWeight[i];
   }
-  
-  int numElem = _elements.size() + rv->_elements.size() - 4; 
+
+  int numElem = _elements.size() + rv->_elements.size() - 4;
   ans += getQualDegree(numElem) + sumQualAngle / sumAngle;
   return ans;
 }
@@ -4317,11 +4317,11 @@ double Rec2DVertex::/*vertEdgeQual_*/getGainMerge(const Rec2DVertex *rv) const
 void Rec2DVertex::updateWAQualEdges(double d, int a)
 {
   double oldQual = getQual(VertQuality);
-  
+
   _sumWQualEdge += d;
   _sumWeightEdge += a;
   _lastUpdate = Recombine2D::getNumChange();
-  
+
   Rec2DData::updateVertQual(getQual(VertQuality)-oldQual, VertQuality);
 }
 
@@ -4361,7 +4361,7 @@ bool Rec2DVertex::checkQuality() const
 {
   double wQualAngle = .0, wQualEdge = .0;
   int weightAngle = 0, weightEdge = 0;
-  
+
   for (unsigned int i = 0; i < _elements.size(); ++i) {
     wQualAngle += _elements[i]->getWeightedAngleQual(this);
     weightAngle += _elements[i]->getAngleWeight();
@@ -4370,7 +4370,7 @@ bool Rec2DVertex::checkQuality() const
     wQualEdge += _edges[i]->getWeightedQual();
     weightEdge += _edges[i]->getWeight();
   }
-  
+
   if (wQualAngle < _sumWQualAngle - 1e12 ||
       wQualAngle > _sumWQualAngle + 1e12 ||
       weightAngle != _sumWeightAngle) {
@@ -4385,7 +4385,7 @@ bool Rec2DVertex::checkQuality() const
                _sumWQualEdge, _sumWeightEdge, wQualEdge, weightEdge);
     return false;
   }
-  
+
   return true;
 }
 
@@ -4433,7 +4433,7 @@ void Rec2DVertex::_updateQualAngle()
 {
   double oldQual1 = getQual(VertQuality);
   double oldQual2 = getQual(VertEdgeQuality);
-  
+
   _sumWQualAngle = .0;
   _sumWeightAngle = 0;
   for (unsigned int i = 0; i < _elements.size(); ++i) {
@@ -4441,7 +4441,7 @@ void Rec2DVertex::_updateQualAngle()
     _sumWQualAngle += _elements[i]->getWeightedAngleQual(this);
   }
   _lastUpdate = Recombine2D::getNumChange();
-  
+
   Rec2DData::updateVertQual(getQual(VertQuality)-oldQual1, VertQuality);
   Rec2DData::updateVertQual(getQual(VertEdgeQuality)-oldQual2, VertEdgeQuality);
 }
@@ -4466,7 +4466,7 @@ Rec2DElement::Rec2DElement(MTriangle *t, const Rec2DEdge **re, Rec2DVertex **rv)
     _elements[i] = Rec2DEdge::getTheOnlyElement(_edges[i]);
   _edges[3] = NULL;
   _elements[3] = NULL;
-  
+
   reveal(rv);
   if (!edgesAreInOrder(_edges, 3)) Msg::Error("tri |%d|", getNum());
 }
@@ -4478,7 +4478,7 @@ Rec2DElement::Rec2DElement(MQuadrangle *q, const Rec2DEdge **re, Rec2DVertex **r
     _edges[i] = (Rec2DEdge*)re[i];
   for (int i = 0; i < 4; ++i)
     _elements[i] = Rec2DEdge::getTheOnlyElement(_edges[i]);
-  
+
   reveal(rv);
   if (!edgesAreInOrder(_edges, 4)) Msg::Error("quad |%d|", getNum());
 }
@@ -4511,7 +4511,7 @@ void Rec2DElement::reveal(Rec2DVertex **rv)
     if (_elements[i])
       _elements[i]->addNeighbour(_edges[i], this);
   }
-  
+
   if (rv) {
     for (int i = 0; i < _numEdge; ++i)
       rv[i]->add(this);
@@ -4542,7 +4542,7 @@ void Rec2DElement::add(Rec2DEdge *re)
   }
   if (i == _numEdge)
     Msg::Error("[Rec2DElement] Already %d edges, can't add anymore", _numEdge);
-  
+
   if (_numEdge == 3)
     re->addHasTri();
 }
@@ -4582,7 +4582,7 @@ void Rec2DElement::addNeighbour(const Rec2DEdge *re, const Rec2DElement *rel)
       return;
     }
   }
-  
+
   Rec2DElement *elem[2];
   Rec2DEdge::getElements(re, elem);
   int a, b = a = 0;
@@ -4806,7 +4806,7 @@ double Rec2DElement::getAngle(const Rec2DVertex *rv) const
 {
   std::vector<Rec2DVertex*> vert;
   getVertices(vert);
-  
+
   int index = -1;
   for (int i = 0; i < _numEdge; ++i) {
     if (vert[i] == rv) {
@@ -4819,15 +4819,15 @@ double Rec2DElement::getAngle(const Rec2DVertex *rv) const
     Msg::Info("im %d, the vertex is %d", getNum(), rv->getNum());
     return -1.;
   }
-  
+
   int i1 = (index+_numEdge-1)%_numEdge;
   int i0 = (index+1)%_numEdge;
   double ang =  atan2(vert[i0]->v() - rv->v(), vert[i0]->u() - rv->u())
                 - atan2(vert[i1]->v() - rv->v(), vert[i1]->u() - rv->u());
-  
+
   static unsigned int a = 0;
   if (++a < 2) Msg::Warning("FIXME use real angle instead of parametric angle");
-  
+
   if (ang < .0)
     return ang + 2.*M_PI;
   return ang;
@@ -4893,14 +4893,14 @@ bool Rec2DElement::checkCoherence() const
     }
     return false;
   }
-  
+
   for (int i = 1; i < _numEdge; ++i) {
     for (int j = 0; j < i; ++j) {
       if (_edges[i] == _edges[j]) return false;
       if (v[i] == v[j]) return false;
     }
   }
-  
+
   for (int i = 0; i < _numEdge; ++i) {
     if (!v[i]->has(this)) {
       Msg::Error("vertex don't have me (im %d)", getNum());
@@ -4915,7 +4915,7 @@ bool Rec2DElement::checkCoherence() const
       return false;
     }
   }
-  
+
   if (Recombine2D::onlyRecombinations()) {
     if (_numEdge == 3) {
       if (_actions.size() == 1 && !Rec2DData::hasHasOneAction(this)) {
@@ -4955,10 +4955,10 @@ void Rec2DElement::print() const
 void Rec2DElement::createElement(double shiftx, double shifty) const
 {
   MVertex *mv[4];
-  
+
   std::vector<Rec2DVertex*> v;
   getVertices(v);
-  
+
   for (unsigned int i = 0; i < v.size(); ++i) {
     mv[i] = new MVertex(v[i]->getMVertex()->x() + shiftx,
                         v[i]->getMVertex()->y() + shifty,
@@ -5468,7 +5468,7 @@ namespace func {
       delete incompatibilities[i];
     }
   }
-  
+
   void findMaximumClique(std::vector<Ra2Incomp*> &truc)
   {
     if (truc.empty()) {
@@ -6040,13 +6040,13 @@ Rec2DNode::Rec2DNode(Rec2DNode *father, Rec2DAction *ra, int depth)
     Msg::Error("[Rec2DNode:constructor] Nothing to do");
     return;
   }
-  
+
   if (!father) Recombine2D::setNewTreeNode(this);
-  
+
   for (int i = 0; i < REC2D_NUMB_SONS; ++i)
     _son[i] = NULL;
   if (_ra) _ra->addPointing();
-  
+
   if (!depth) {
     _reward = _ra->getRealReward();
     if (Recombine2D::checkIfNotAllQuad()) {
@@ -6064,7 +6064,7 @@ Rec2DNode::Rec2DNode(Rec2DNode *father, Rec2DAction *ra, int depth)
     }
     return;
   }
-  
+
   // Apply changes
   std::vector<Rec2DElement*> savedNeighbours; // for Collapses
   if (_ra) {
@@ -6077,14 +6077,14 @@ Rec2DNode::Rec2DNode(Rec2DNode *father, Rec2DAction *ra, int depth)
     }
     _reward = Rec2DData::getGlobalQuality() - _globalQuality;
   }
-  
+
   // Create branches
   std::vector<Rec2DAction*> actions;
   Recombine2D::incNumChange();
   Recombine2D::nextTreeActions(actions, savedNeighbours, this);
   if (actions.empty() && depth < 0) Rec2DData::addEndNode(this);
   if (actions.size()) _createSons(actions, depth);
-  
+
   // Revert changes
   if (_dataChange) {
     if (!Rec2DData::revertDataChange(_dataChange))
@@ -6132,10 +6132,10 @@ void Rec2DNode::lookahead(int depth)
     // return a notAllQuad node
     return;
   }
-  
+
   _bestSeqReward = .0;
   _expectedSeqReward = .0;
-  
+
   if (_son[0]) {
     _depth = depth;
     _makeDevelopments(depth);
@@ -6163,13 +6163,13 @@ Rec2DNode* Rec2DNode::selectBestNode(Rec2DNode *rn)
     while (father) {
       if (!Rec2DData::revertDataChange(rn->_dataChange))
         Msg::Error(" 4 - don't reverted changes");
-      
+
       rn->_rmvFather(father);
       father->_rmvSon(rn);
       delete rn;
       rn = father;
       father = rn->_father;
-      
+
       if (!rn->_getNumSon()) rn->_notAllQuad = true;
       else {
 #ifdef DRAW_WHEN_SELECTED
@@ -6180,21 +6180,21 @@ Rec2DNode* Rec2DNode::selectBestNode(Rec2DNode *rn)
     }
     return NULL;
   }
-  
+
   if (!rn->_son[0])
     return NULL;
-  
+
 #ifdef DRAW_BEST_SEQ
   rn->_son[0]->printSequence();
 #endif
-  
+
   for (int i = 1; i < REC2D_NUMB_SONS; ++i) {
     rn->_delSons(false);
   }
   if (Recombine2D::dynamicTree()) {
     rn->_son[0]->_delSons(true);
   }
-  
+
   if (!rn->_son[0]->makeChanges()) Msg::Error("[Rec2DNode] No changes");
 
 #ifndef DRAW_BEST_SEQ
@@ -6202,10 +6202,10 @@ Rec2DNode* Rec2DNode::selectBestNode(Rec2DNode *rn)
     __draw(REC2D_WAIT_SELECTED);
 #endif
 #endif
-  
+
   static int a = 0;
   if (++a == 1) Msg::Warning("FIXME : if only recombines : can do all alone recombinations at beginning");
-  
+
   return rn->_son[0];
 }
 
@@ -6256,10 +6256,10 @@ bool Rec2DNode::canBeDeleted() const
 void Rec2DNode::printIdentity() const
 {
   Msg::Info("---- I am a node (n%d)", this);
-  
+
   if (_father)
     Msg::Info("     I have a father (n%d)", _father);
-  
+
   if (_ra) {
     Msg::Info("     My action is (ac%d)", _ra);
     _ra->printIdentity();
@@ -6286,14 +6286,14 @@ void Rec2DNode::_makeDevelopments(int depth)
 {
   if (Recombine2D::revertIfNotAllQuad() && _notAllQuad)
     Msg::Error("[Rec2DNode] Mais !");
-  
+
   int numSon = 0;
   while (numSon < REC2D_NUMB_SONS && _son[numSon]) ++numSon;
-  
+
   int i = 0, k2 = REC2D_NUMB_SONS;
   while (i < numSon) {
     _son[i]->_develop(depth-1);
-    
+
     if (Recombine2D::avoidIfNotAllQuad() && _son[i]->_isNotAllQuad()) {
       if (_son[--k2]) {
         Rec2DNode *tmp = _son[k2];
@@ -6318,7 +6318,7 @@ void Rec2DNode::_makeDevelopments(int depth)
       ++i;
     }
   }
-  
+
   if (numSon == 0) {
     _notAllQuad = true;
     if (!Recombine2D::revertIfNotAllQuad()) {
@@ -6331,7 +6331,7 @@ void Rec2DNode::_makeDevelopments(int depth)
       ++k2;
     }
   }
-  
+
   for (int j = k2; j < REC2D_NUMB_SONS; ++j) {
     _son[j]->_rmvFather(this);
     delete _son[j];
@@ -6345,7 +6345,7 @@ void Rec2DNode::_createSons(const std::vector<Rec2DAction*> &actions, int depth)
     Msg::Error("[Rec2DNode:_createSons] Nothing to do");
     return;
   }
-  
+
   Rec2DNode *tmpNode;
   int k1 = -1, k2 = REC2D_NUMB_SONS;
   for (unsigned int i = 0; i < actions.size(); ++i) {
@@ -6364,7 +6364,7 @@ void Rec2DNode::_createSons(const std::vector<Rec2DAction*> &actions, int depth)
       }
     }
   }
-  
+
   if (k1 < 0) {
     _notAllQuad = true;
     if (!Recombine2D::revertIfNotAllQuad()) {
@@ -6377,7 +6377,7 @@ void Rec2DNode::_createSons(const std::vector<Rec2DAction*> &actions, int depth)
       ++k2;
     }
   }
-  
+
   for (int i = k2; i < REC2D_NUMB_SONS; ++i) {
     _son[i]->_rmvFather(this);
     delete _son[i];
@@ -6397,14 +6397,14 @@ void Rec2DNode::_develop(int depth)
     return;
   }
   _depth = depth;
-  
+
   _bestSeqReward = .0;
   _expectedSeqReward = .0;
-  
+
   std::vector<Rec2DElement*> neighbours;
   if (!_son[0])
     _ra->getNeighbElemWithActions(neighbours);
-  
+
   bool hadAction = _createdActions;
   _dataChange = Rec2DData::getNewDataChange();
   _ra->apply(_dataChange, _createdActions);
@@ -6413,7 +6413,7 @@ void Rec2DNode::_develop(int depth)
       (*_createdActions)[i]->addPointing();
   }
   _reward = Rec2DData::getGlobalQuality() - _globalQuality;
-  
+
   if (_son[0]) _makeDevelopments(depth);
   else {
     std::vector<Rec2DAction*> actions;
@@ -6421,7 +6421,7 @@ void Rec2DNode::_develop(int depth)
     Recombine2D::nextTreeActions(actions, neighbours, this);
     if (actions.size()) _createSons(actions, depth);
   }
-  
+
   if (!Rec2DData::revertDataChange(_dataChange))
     Msg::Error(" 2 - don't reverted changes");
   else
@@ -6429,7 +6429,7 @@ void Rec2DNode::_develop(int depth)
   _dataChange = NULL;
 }
 
-int Rec2DNode::_getNumSon() const 
+int Rec2DNode::_getNumSon() const
 {
   int num = 0;
   for (int i = 0; i < REC2D_NUMB_SONS; ++i) {
@@ -6483,7 +6483,7 @@ bool Rec2DNode::_rmvSon(Rec2DNode *n)
 {
   int i = -1;
   while (++i < REC2D_NUMB_SONS && _son[i] != n);
-  
+
   if (i == REC2D_NUMB_SONS) {
     Msg::Info("im %d", this);
     for (int i = 0; i < REC2D_NUMB_SONS; ++i) {
diff --git a/Mesh/meshGFaceRecombine.h b/Mesh/meshGFaceRecombine.h
index 773bdd04bcbe8d3149805bb34a4ff2699372f47c..8add61012fc8fe38d788481d542394701b75b926 100644
--- a/Mesh/meshGFaceRecombine.h
+++ b/Mesh/meshGFaceRecombine.h
@@ -1,7 +1,7 @@
-// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Amaury Johnen (a.johnen@ulg.ac.be)
@@ -98,18 +98,18 @@ class Recombine2D {
     int _numChange;
     double _lastRunTime;
     Rec2DNode *_curNode;
-    
+
     // Parameter :
     const bool _collapses;
     int _strategy, _horizon;
     Rec2DQualCrit _qualCriterion;
-    
+
     bool _checkIfNotAllQuad; // Check if action implies triangle isolation
     bool _avoidIfNotAllQuad; // Don't apply action if it implies triangle isolation
     bool _revertIfNotAllQuad; // Be all quad at any price (can it be not totally unefficient ?)
     bool _oneActionHavePriority; // Tracks and prioritises elements with 1 action
     bool _noProblemIfObsolete; // For recombineSameAsHeuristic
-    
+
     int _weightEdgeBase;
     int _weightEdgeQuad;
     int _weightAngleTri;
@@ -118,24 +118,24 @@ class Recombine2D {
     float _coefDegreeQual;
     float _coefLengthQual;
     float _coefOrientQual;
-    
+
 #ifdef REC2D_RECO_BLOS
     bool _recombineWithBlossom;
     bool _saveBlossomMesh;
     int *elist;
     std::map<MElement*, int> t2n;
 #endif
-    
+
   public :
 
     static double t0, t1, t2, t3, t4, t5, t6, t7, t8, t9;
 
     Recombine2D(GFace*, bool collapses);
     ~Recombine2D();
-    
+
     // Construct data
     bool construct();
-    
+
     // Recombination methods
     bool recombine();
     bool recombineNewAlgo(int horiz = -1, int code = -1);
@@ -147,15 +147,15 @@ class Recombine2D {
     static void nextTreeActions(std::vector<Rec2DAction*>&,
                                 const std::vector<Rec2DElement*> &neighbours,
                                 const Rec2DNode *node = NULL);
-    
+
     // Revert recombinations
     void clearChanges();
-    
+
     // Save mesh & stats
     void updateMesh();
     void saveMesh(std::string);
     void saveStats(std::fstream*);
-    
+
     // Get/Set methods
     inline void setParamNewAlgo(int horiz, int code) {
       Rec2DAlgo::setParam(horiz, code);
@@ -171,7 +171,7 @@ class Recombine2D {
     static inline Rec2DQualCrit getQualCrit() {return _cur->_qualCriterion;}
     static inline void setNewTreeNode(Rec2DNode *rn) {_cur->_curNode = rn;}
     static inline double getTimeLastRun() {return _cur->_lastRunTime;}
-    
+
     // What is asked ?
     static inline bool dynamicTree() {return _cur->_strategy == 6;}
     static inline bool blossomRec() {return _cur->_recombineWithBlossom;}
@@ -184,7 +184,7 @@ class Recombine2D {
     static inline bool revertIfNotAllQuad() {return _cur->_revertIfNotAllQuad;}
     static inline bool priorityOfOneAction() {return _cur->_oneActionHavePriority;}
     static inline bool canIsolateTriangle() {return _cur->_noProblemIfObsolete;}
-    
+
     // Get/Set Weights
     static inline int getWeightEdgeBase() {return _cur->_weightEdgeBase;}
     static inline int getWeightEdgeQuad() {return _cur->_weightEdgeQuad;}
@@ -194,7 +194,7 @@ class Recombine2D {
     static inline void setWeightEdgeQuad(int a) {_cur->_weightEdgeQuad = a;}
     static inline void setWeightAngleTri(int a) {_cur->_weightAngleTri = a;}
     static inline void setWeightAngleQuad(int a) {_cur->_weightAngleQuad = a;}
-    
+
     // Get/Set Coefficients
     static inline float getCoefAngleQual() {return _cur->_coefAngleQual;}
     static inline float getCoefDegreeQual() {return _cur->_coefDegreeQual;}
@@ -210,7 +210,7 @@ class Recombine2D {
     static inline void setCoefDegreeQual(float f) {_cur->_coefDegreeQual = f;}
     static inline void setCoefLengthQual(float f) {_cur->_coefLengthQual = f;}
     static inline void setCoefOrientQual(float f) {_cur->_coefOrientQual = f;}
-    
+
     // Miscellaneous
     void compareWithBlossom();
     int computeQualBlossom() const;
@@ -225,15 +225,15 @@ class Recombine2D {
                                  const MElement *quad     );
     //
     static inline double angle2qual(double ang) {
-      return std::max(1. - fabs(ang*2./M_PI - 1.), .0); 
+      return std::max(1. - fabs(ang*2./M_PI - 1.), .0);
     }
-    
+
     // Debug
     void printState() const;
     void drawState(double shiftx, double shifty, bool color = false) const;
     static void drawStateCur(double dx, double dy) {_cur->drawState(dx, dy);}
     static void drawStateOrigin();
-    
+
   private :
     double _geomAngle(const MVertex*,
                       const std::vector<GEdge*>&,
@@ -262,16 +262,16 @@ class Rec2DData {
     struct lessAction {
       bool operator()(const Action*, const Action*) const;
     };
-    
+
   private :
     static Rec2DData *_cur;
-    
+
     long double _1valVert, _2valEdge, _2valVert;
     int _numVert, _numEdge;
 #ifdef REC2D_RECO_BLOS
     int _0blossomQuality;
 #endif
-    
+
     // Store entities
     std::vector<Rec2DEdge*> _edges;
     std::vector<Rec2DVertex*> _vertices;
@@ -292,39 +292,39 @@ class Rec2DData {
     std::vector<Rec2DAction*> _OActions;
     std::set<Rec2DAction*, gterRec2DAction> _sortedOActions; // if blossom !
 
-    
+
     // Store changes (so can revert)
     std::vector<Rec2DDataChange*> _changes;
-    
+
     // Store parities
     std::map<int, std::vector<Rec2DVertex*> > _parities;
     std::map<Rec2DVertex*, int> _oldParity;
-    
+
     // for Recombine2D::developTree(..)
     std::vector<Rec2DNode*> _endNodes;
-    
+
     // Useless Rec2DTwoTri2Quad are not deleted because Rec2DCollapse need them
     std::vector<Rec2DAction*> _hiddenActions;
-    
+
     // Track elements with one or zero actions
     std::set<Rec2DElement*> _elementWithOneAction;
     std::set<Rec2DElement*> _elementWithZeroAction;
-    
+
 #ifdef REC2D_RECO_BLOS
     std::map<MElement*, Rec2DElement*> _mel2rel;
 #endif
-  
+
   public :
 #if 1//def REC2D_DRAW
     std::vector<MTriangle*> _tri;
     std::vector<MQuadrangle*> _quad;
 #endif
-    
+
   public :
     Rec2DData();
     ~Rec2DData();
     static inline bool hasInstance() {return _cur;}
-    
+
     // Get/Set methods
     //static inline int getNumVert() {return _cur->_numVert;}
     //static inline int getNumEdge() {return _cur->_numEdge;}
@@ -336,7 +336,7 @@ class Rec2DData {
     static inline int getBlosQual() {return _cur->_0blossomQuality;}
 #endif
     static inline unsigned int getNumElements() {return _cur->_elements.size();}
-    
+
     // Add/Remove Entities
     static void add(const Rec2DEdge*);
     static void add(const Rec2DVertex*);
@@ -344,7 +344,7 @@ class Rec2DData {
     static void rmv(const Rec2DEdge*);
     static void rmv(const Rec2DVertex*);
     static void rmv(const Rec2DElement*);
-    
+
     // Entities iterators
     typedef std::vector<Rec2DEdge*>::iterator iter_re;
     typedef std::vector<Rec2DVertex*>::iterator iter_rv;
@@ -355,7 +355,7 @@ class Rec2DData {
     static inline iter_re lastEdge() {return _cur->_edges.end();}
     static inline iter_rv lastVertex() {return _cur->_vertices.end();}
     static inline iter_rel lastElement() {return _cur->_elements.end();}
-    
+
     // Operators on Actions
     static void add(const Rec2DAction*);
     static void rmv(const Rec2DAction*);
@@ -365,13 +365,13 @@ class Rec2DData {
     }
     static inline bool hasAction() {return _cur->_actions.size();}
     static inline int getNumAction() {return _cur->_actions.size();}
-    // 
+    //
     static Rec2DAction* getBestAction();
     static Rec2DAction* getRandomAction();
     //inline void sortActions() {sort(_actions.begin(), _actions.end(), gterAction());}
     //
     static void checkObsolete();
-    
+
     // Operators on One & Zero Actions
     static void addHasZeroAction(const Rec2DElement*);
     static void rmvHasZeroAction(const Rec2DElement*);
@@ -384,7 +384,7 @@ class Rec2DData {
     static void getElementsOneAction(std::vector<Rec2DElement*> &vec);
     static Rec2DAction* getOneAction();
     static void getUniqueOneActions(std::vector<Rec2DAction*>&);
-    
+
     // Process parities
     static int getNewParity();
     static void removeParity(const Rec2DVertex*, int);
@@ -392,13 +392,13 @@ class Rec2DData {
       _cur->_parities[p].push_back((Rec2DVertex*)rv);
     }
     static void associateParity(int pOld, int pNew, Rec2DDataChange *rdc = NULL);
-    
+
     // Process DataChange objects
     static Rec2DDataChange* getNewDataChange();
     static bool revertDataChange(Rec2DDataChange*);
     static void clearChanges();
     static inline int getNumChanges() {return _cur->_changes.size();}
-    
+
     // Quality
     static double getGlobalQuality(Rec2DQualCrit c = ChoosedCrit);
     static double getGlobalQuality(int numVert, double valVert,
@@ -412,28 +412,28 @@ class Rec2DData {
 #ifdef REC2D_RECO_BLOS
     static inline void addBlosQual(int val) {_cur->_0blossomQuality += val;}
 #endif
-    
+
     // Check errors
     static bool checkEntities();
     void checkQuality() const;
-    
+
     // Print state / Draw actions
     void printState() const;
     void printActions() const;
     static void printAction() {_cur->printAction();}
-    
+
     // Draw methods
     void drawTriangles(double shiftx, double shifty) const;
     void drawElements(double shiftx, double shifty) const;
     void drawChanges(double shiftx, double shifty, bool color) const;
-    
+
     // Operators on End Nodes
     static void addEndNode(const Rec2DNode*);
     static void sortEndNode();
     static inline void drawEndNode(int num);
     static inline int getNumEndNode() {return _cur->_endNodes.size();}
     static inline int getNumElement() {return _cur->_elements.size();}
-    
+
     // Miscellaneous
     static void copyElements(std::vector<Rec2DElement*> &v) {
       v = _cur->_elements;
@@ -464,11 +464,11 @@ enum Rec2DChangeType {
 };
 
 class Rec2DChange {
-  private : 
+  private :
     Rec2DChangeType _type;
     void *_entity;
     void *_info;
-  
+
   public :
     Rec2DChange() {Msg::Fatal("[Rec2DChange] I should not be created in this manner");}
     Rec2DChange(int);
@@ -495,7 +495,7 @@ class Rec2DChange {
     Rec2DChange(Rec2DEdge*, Rec2DEdge*,
                 const std::vector<Rec2DAction*>&,
                 Rec2DChangeType                  ); // swap edge1 to edge2 (action)
-    
+
     void getHiddenActions(std::set<Rec2DAction*>&);
 
     void revert();
@@ -505,14 +505,14 @@ class Rec2DDataChange {
   private :
     std::vector<Rec2DChange*> _changes;
     Rec2DAction *_ra;
-    
+
   public :
     ~Rec2DDataChange();
-    
+
     inline void add(int a) {_changes.push_back(new Rec2DChange(a));}
-    
+
     inline void hide(Rec2DEdge *re) {_changes.push_back(new Rec2DChange(re, 1));}
-    inline void hide(Rec2DVertex *rv) {_changes.push_back(new Rec2DChange(rv, 1));} 
+    inline void hide(Rec2DVertex *rv) {_changes.push_back(new Rec2DChange(rv, 1));}
     inline void hide(Rec2DElement *rel) {_changes.push_back(new Rec2DChange(rel, 1));}
     std::vector<Rec2DAction*> hiddenActions;
     inline void hide(Rec2DAction *ra) {
@@ -526,10 +526,10 @@ class Rec2DDataChange {
 
     inline void append(Rec2DElement *rel) {_changes.push_back(new Rec2DChange(rel));}
     inline void append(Rec2DAction *ra) {_changes.push_back(new Rec2DChange(ra));}
-    
+
     void swapFor(Rec2DEdge*, Rec2DEdge*);
     void swapFor(Rec2DVertex*, Rec2DVertex*);
-    
+
     inline void relocate(Rec2DVertex *rv, const SPoint2 &p) {
       _changes.push_back(new Rec2DChange(rv, p));
     }
@@ -541,11 +541,11 @@ class Rec2DDataChange {
     }
 
     void checkObsoleteActions(Rec2DVertex*const*, int size);
-    
+
     void getHiddenActions(std::set<Rec2DAction*>&);
 
     void revert();
-    
+
     void setAction(const Rec2DAction *action) {_ra = (Rec2DAction*)action;}
     Rec2DAction* getAction() const {return _ra;}
 };
@@ -556,40 +556,40 @@ class Rec2DAction {
     double _globQualIfExecuted, _reward;
     int _lastUpdate, _numPointing;
     void *_dataAction; // Rec2DData::Action*
-    
+
     friend void Rec2DData::add(const Rec2DAction*);
     friend void Rec2DData::rmv(const Rec2DAction*);
     friend bool Rec2DData::has(const Rec2DAction *ra);
     friend void Rec2DData::Action::update();
-    
+
   public :
     Rec2DAction();
     virtual ~Rec2DAction() {}
     virtual void hide() = 0;
     virtual void reveal() = 0;
-    
+
     // Get methods
     virtual bool isRecomb() const = 0;
-    
+
     // Quality
     double getReward() const;
     double getRealReward() const;
     bool operator<(const Rec2DAction&) const;
-    
+
     // Application
     virtual bool isObsolete() const = 0;
     virtual void apply(std::vector<Rec2DVertex*> &newPar) = 0;
     virtual void apply(Rec2DDataChange*, std::vector<Rec2DAction*>*&,
                        bool color = false) const = 0;
-    
+
     // Swap
     virtual void swap(Rec2DVertex*, Rec2DVertex*) = 0;
     virtual void swap(Rec2DEdge*, Rec2DEdge*) = 0;
-    
+
     // Pointing
     inline void addPointing() {++_numPointing;}
     inline void rmvPointing() {--_numPointing;}
-    
+
     // Get Element methods
     virtual bool has(const Rec2DElement*) const = 0;
     virtual bool haveElem() const = 0;
@@ -600,21 +600,21 @@ class Rec2DAction {
     virtual void getNeighbourElements(std::vector<Rec2DElement*>&) const = 0;
     virtual void getNeighbElemWithActions(std::vector<Rec2DElement*>&) const = 0;
     virtual void getTouchedActions(std::vector<Rec2DAction*>&) const = 0;
-    
+
     // Get Vertex methods
     virtual Rec2DVertex* getVertex(int) const = 0;
-    
+
     // Check errors
     virtual bool checkCoherence(const Rec2DAction *ra = NULL) const = 0;
     inline void *getDataAction() const {return _dataAction;}
-    
+
     // Debug
     virtual void printAdress() = 0;
     virtual void printReward() const = 0;
     virtual void printTypeRew() const = 0;
     virtual void printVertices() const = 0;
     virtual void printIdentity() const = 0;
-    
+
     // Miscellaneous
     virtual Rec2DAction* getBase() const = 0;
     virtual Rec2DAction* getInfant() const = 0;
@@ -623,7 +623,7 @@ class Rec2DAction {
     virtual void getIncompatible(std::vector<Rec2DAction*>&) = 0;
     //
     static void removeDuplicate(std::vector<Rec2DAction*>&);
-    
+
   private :
     virtual void _computeGlobQual() = 0;
     virtual void _computeReward() = 0;
@@ -636,33 +636,33 @@ class Rec2DTwoTri2Quad : public Rec2DAction {
     Rec2DVertex *_vertices[4]; // 4 boundary (2 on embedded edge + 2)
     Rec2DCollapse *_col;
     double _valVert;
-    
+
 #ifdef REC2D_RECO_BLOS
     RecombineTriangle *_rt;
 #endif
 
     friend class Rec2DCollapse;
-    
+
   public :
     Rec2DTwoTri2Quad(Rec2DElement*, Rec2DElement*);
     ~Rec2DTwoTri2Quad() {}
     void operator delete(void*);
     virtual void hide();
     virtual void reveal();
-    
+
     // Get methods
     inline bool isRecomb() const {return true;}
-    
+
     // Application
     virtual bool isObsolete() const;
     virtual void apply(std::vector<Rec2DVertex*> &newPar);
     virtual void apply(Rec2DDataChange*, std::vector<Rec2DAction*>*&,
                        bool color = false) const;
-    
+
     // Swap
     virtual void swap(Rec2DVertex*, Rec2DVertex*);
     virtual void swap(Rec2DEdge*, Rec2DEdge*);
-    
+
     // Get Element methods
     virtual bool has(const Rec2DElement*) const;
     virtual inline bool haveElem() const {return true;}
@@ -673,27 +673,27 @@ class Rec2DTwoTri2Quad : public Rec2DAction {
     virtual void getNeighbourElements(std::vector<Rec2DElement*>&) const;
     virtual void getNeighbElemWithActions(std::vector<Rec2DElement*>&) const;
     virtual void getTouchedActions(std::vector<Rec2DAction*>&) const;
-    
+
     // Get Vertex methods
     virtual inline Rec2DVertex* getVertex(int i) const {return _vertices[i];} //-
-    
+
     // Check errors
     virtual bool checkCoherence(const Rec2DAction *ra = NULL) const;
-    
+
     // Debug
     virtual inline void printAdress() {Msg::Info(" %d", this);}
     virtual void printReward() const;
     virtual inline void printTypeRew() const {Msg::Info("Recombine %g", _globQualIfExecuted);}
     virtual void printVertices() const;
     virtual void printIdentity() const;
-    
+
     // Miscellaneous
     virtual inline Rec2DAction* getBase() const {return NULL;}
     virtual inline Rec2DAction* getInfant() const {return (Rec2DAction*)_col;}
     virtual MElement* createMElement(double shiftx, double shifty);
     virtual void color(int, int, int) const;
     virtual void getIncompatible(std::vector<Rec2DAction*>&);
-    
+
   private :
     virtual void _computeGlobQual();
     virtual void _computeReward();
@@ -703,27 +703,27 @@ class Rec2DTwoTri2Quad : public Rec2DAction {
 class Rec2DCollapse : public Rec2DAction {
   private :
     Rec2DTwoTri2Quad *_rec;
-    
+
   public :
     Rec2DCollapse(Rec2DTwoTri2Quad*);
     ~Rec2DCollapse() {}
     void operator delete(void*);
     virtual void hide();
     virtual void reveal();
-    
+
     // Get methods
     inline bool isRecomb() const {return false;}
-    
+
     // Application
     virtual bool isObsolete() const;
     virtual void apply(std::vector<Rec2DVertex*> &newPar);
     virtual void apply(Rec2DDataChange*, std::vector<Rec2DAction*>*&,
                        bool color = false) const;
-    
+
     // Swap
     virtual inline void swap(Rec2DVertex *rv0, Rec2DVertex *rv1) {_rec->swap(rv0, rv1);}
     virtual inline void swap(Rec2DEdge *re0, Rec2DEdge *re1) {_rec->swap(re0, re1);}
-    
+
     // Get Element methods
     virtual inline bool has(const Rec2DElement *rel) const {return _rec->has(rel);}
     virtual inline bool haveElem() const {return false;}
@@ -738,31 +738,31 @@ class Rec2DCollapse : public Rec2DAction {
     virtual void getNeighbourElements(std::vector<Rec2DElement*> &) const;
     virtual void getNeighbElemWithActions(std::vector<Rec2DElement*> &) const;
     virtual void getTouchedActions(std::vector<Rec2DAction*>&) const {}
-    
+
     // Get Vertex methods
     virtual inline Rec2DVertex* getVertex(int i) const {
       return _rec->getVertex(i);
     }
-    
+
     // Check errors
     virtual inline bool checkCoherence(const Rec2DAction *ra = NULL) const {
       return _rec->checkCoherence(this);
     }
-    
+
     // Debug
     virtual inline void printAdress() {_rec->printAdress();}
     virtual void printReward() const;
     virtual inline void printTypeRew() const {Msg::Info("Collapse %g", _globQualIfExecuted);}
     virtual inline void printVertices() const {_rec->printVertices();}
     virtual void printIdentity() const;
-    
+
     // Miscellaneous
     virtual inline Rec2DAction* getBase() const {return _rec;}
     virtual inline Rec2DAction* getInfant() const {return NULL;}
     virtual inline MElement* createMElement(double shiftx, double shifty) {return NULL;}
     virtual inline void color(int c1, int c2, int c3) const {_rec->color(c1, c2, c3);}
     virtual void getIncompatible(std::vector<Rec2DAction*>&) {Msg::Fatal("not implemented");};
-    
+
   private :
     virtual void _computeGlobQual();
     virtual void _computeReward();
@@ -775,48 +775,48 @@ class Rec2DEdge {
     Rec2DVertex *_rv0, *_rv1;
     double _qual;
     int _weight;
-    int _lastUpdate; 
-    
+    int _lastUpdate;
+
     int _pos; // For quick add and remove in Rec2DData
     friend void Rec2DData::add(const Rec2DEdge*);
     friend void Rec2DData::rmv(const Rec2DEdge*);
-    
+
   public :
     Rec2DEdge(Rec2DVertex*, Rec2DVertex*);
     ~Rec2DEdge() {if (_pos > -1) hide();}
     void hide();
     void reveal();
-    
+
     // Get Vertex methods
     inline bool has(const Rec2DVertex *v) const {return v == _rv0 || v == _rv1;}
     inline Rec2DVertex* getVertex(int i) const {if (i) return _rv1; return _rv0;}
     Rec2DVertex* getOtherVertex(const Rec2DVertex*) const;
-    
+
     // Get Element methods
     static Rec2DElement* getTheOnlyElement(const Rec2DEdge*);
     static void getElements(const Rec2DEdge*, Rec2DElement**);
-    
+
     // Get Action methods
     //void getUniqueActions(std::vector<Rec2DAction*>&) const;
-    
+
     // Quality
     inline double getQual() const {return _qual;}
     inline int getWeight() const {return _weight;}
     inline double getWeightedQual() const {return _weight * _qual;}
     void updateQual();
-    
+
     // Miscellaneous
     inline bool isOnBoundary() const;
     inline void addHasTri() {_addWeight(-Recombine2D::getWeightEdgeQuad());}
     inline void remHasTri() {_addWeight(Recombine2D::getWeightEdgeQuad());}
     void swap(Rec2DVertex *oldRV, Rec2DVertex *newRV, bool upVert = true);
-    
+
     // Check errors
     bool checkCoherence() const;
-    
+
     // Debug
     void print() const;
-    
+
   private :
     void _computeQual();
     void _addWeight(int);
@@ -828,8 +828,8 @@ struct AngleData {
   std::vector<GEdge*> _gEdges;
   std::vector<MElement*> _mElements;
   Rec2DVertex *_rv;
-  
-  AngleData() : _rv(NULL) {} 
+
+  AngleData() : _rv(NULL) {}
 };
 
 class Rec2DVertex {
@@ -838,10 +838,10 @@ class Rec2DVertex {
     const double _angle;
     int _onWhat; // _onWhat={-1:corner,0:edge,1:face}
     int _parity, _lastUpdate;
-    
+
     double _sumWQualAngle, _sumWQualEdge;
     int _sumWeightAngle, _sumWeightEdge;
-    
+
     std::vector<Rec2DEdge*> _edges;
     std::vector<Rec2DElement*> _elements;
     SPoint2 _param;
@@ -849,20 +849,20 @@ class Rec2DVertex {
     int _pos; // For quick add and remove in Rec2DData
     friend void Rec2DData::add(const Rec2DVertex*);
     friend void Rec2DData::rmv(const Rec2DVertex*);
-    
+
     static double **_qualVSnum;
     static double **_gains;
-    
+
   public :
     Rec2DVertex(MVertex*);
     Rec2DVertex(Rec2DVertex*, double angle);
     ~Rec2DVertex() {if (_pos > -1) hide();}
     void hide(bool check = true);
     void reveal();
-    
+
     // Initialize topo qual table
     static void initStaticTable();
-    
+
     // Get methods
     inline double u() const {return _param[0];}
     inline double v() const {return _param[1];}
@@ -875,44 +875,44 @@ class Rec2DVertex {
     inline double getGeomAngle() const {return _angle;}
     inline int getLastUpdate() const {return _lastUpdate;}
     inline MVertex* getMVertex() const {return _v;}
-    
+
     // Add/Remove Edges
     void add(const Rec2DEdge*);
     bool has(const Rec2DEdge*) const;
     void rmv(const Rec2DEdge*);
-    
+
     // Add/Remove Elements
     void add(const Rec2DElement*);
     bool has(const Rec2DElement*) const;
     void rmv(const Rec2DElement*);
-    
+
     // Get Edge methods
     inline void getEdges(std::vector<Rec2DEdge*> &v) const {v = _edges;}
     void getMoreUniqueEdges(std::vector<Rec2DEdge*>&) const;
     static Rec2DEdge* getCommonEdge(const Rec2DVertex*, const Rec2DVertex*);
-    
+
     // Get Vertex methods
     void getMoreNeighbourVertices(std::vector<Rec2DVertex*>&) const;
-    
+
     // Get Element methods
     inline int getNumElements() const {return _elements.size();}
     inline void getElements(std::vector<Rec2DElement*> &v) const {v = _elements;}
     static void getCommonElements(const Rec2DVertex*, const Rec2DVertex*,
                                   std::vector<Rec2DElement*>&            );
-    
+
     // Get Action methods
     void getMoreUniqueActions(std::vector<Rec2DAction*>&) const;
-    
+
     // Get/Set on boundary
     inline void setOnBoundary();
     inline bool getOnBoundary() const {return _onWhat < 1;}
-    
+
     // Get/Set parity
     inline int getParity() const {return _parity;}
     void setParity(int, bool tree = false);
     void setParityWD(int pOld, int pNew);
     bool setBoundaryParity(int p0, int p1);
-    
+
     // Quality
     double getQualDegree(int numEl = -1) const;
     double getGainDegree(int) const;
@@ -935,7 +935,7 @@ class Rec2DVertex {
     double getGainMerge(const Rec2DVertex*, const Rec2DEdge*const*, int) const;
     double getGainOneElemLess() const;
     double getGainMerge(const Rec2DVertex*) const;
-    
+
     double getQual(Rec2DQualCrit crit = ChoosedCrit) const;
     double getQual(double waQualAngles, double waQualEdges, int numElem,
                    Rec2DQualCrit c = ChoosedCrit) const;
@@ -946,25 +946,25 @@ class Rec2DVertex {
                          const Rec2DEdge *adjacent2 = NULL) const;
 #endif
     void updateWAQualEdges(double d, int a = 0);
-    
+
     // Miscellaneous
     void relocate(SPoint2 p);
     inline int getNum() const {return _v->getNum();}
-    
+
     // Check errors
     bool checkCoherence() const;
     bool checkQuality() const;
-    
+
     // Debug
     void printElem() const;
     void printQual() const;
-    
+
   private :
     //inline double _getQualAngle() const {return _sumQualAngle/_elements.size();}
     bool _recursiveBoundParity(const Rec2DVertex *prev, int p0, int p1);
     void _updateQualAngle();
     //inline double _angle2Qual(double ang) const {
-    //  return std::max(1. - fabs(ang*2./M_PI - 1.), .0); 
+    //  return std::max(1. - fabs(ang*2./M_PI - 1.), .0);
     // }
     double _qualDegree(int numEl = -1) const;
     inline double _WAQualAngles() const {return _sumWQualAngle / _sumWeightAngle;}
@@ -992,61 +992,61 @@ class Rec2DElement {
     Rec2DEdge *_edges[4];
     Rec2DElement *_elements[4]; // NULL if no neighbour
     std::vector<Rec2DAction*> _actions;
-    
+
     int _pos; // For quick add and remove in Rec2DData
     friend void Rec2DData::add(const Rec2DElement*);
     friend void Rec2DData::rmv(const Rec2DElement*);
-    
+
   public :
     Rec2DElement(MTriangle*, const Rec2DEdge**, Rec2DVertex **rv = NULL);
     Rec2DElement(MQuadrangle*, const Rec2DEdge**, Rec2DVertex **rv = NULL);
     ~Rec2DElement() {if (_pos > -1) hide();}
     void hide();
     void reveal(Rec2DVertex **rv = NULL);
-    
+
     // Add/Remove Edges
     void add(Rec2DEdge*);
     bool has(const Rec2DEdge*) const;
-    
+
     // Has Vertex/Element
     bool has(const Rec2DVertex*) const;
     bool has(const Rec2DElement*) const;
-    
+
     // Add/Remove neighbour Elements
     void addNeighbour(const Rec2DEdge*, const Rec2DElement*);
     void rmvNeighbour(const Rec2DEdge*, const Rec2DElement*);
     bool isNeighbour(const Rec2DEdge*, const Rec2DElement*) const;
-    
+
     // Add/Remove Actions
     void add(const Rec2DAction*);
     void rmv(const Rec2DAction*);
     bool has(const Rec2DAction*) const;
-    
+
     // Get Edge methods
     inline void getMoreEdges(std::vector<Rec2DEdge*> &v) const {
       v.insert(v.end(), _edges, _edges + _numEdge);
     }
     static Rec2DEdge* getCommonEdge(const Rec2DElement*, const Rec2DElement*);
-    
+
     // Get Vertex methods
     void getVertices(std::vector<Rec2DVertex*>&) const;
     Rec2DVertex* getOtherVertex(const Rec2DVertex*, const Rec2DVertex*) const;
-    
+
     // Get Element methods
     void getMoreNeighbours(std::vector<Rec2DElement*>&) const;
     //static void getElements(const Rec2DEdge*, Rec2DElement**);
-    
+
     // Get Action methods
     inline int getNumActions() const {return _actions.size();}
     inline Rec2DAction* getAction(int i) const {return _actions[i];}
     inline void getActions(std::vector<Rec2DAction*> &v) const {v = _actions;};
     void getMoreUniqueActions(std::vector<Rec2DAction*>&) const;
     void getMoreUniqueActions(std::set<Rec2DAction*, gterRec2DAction>&) const;
-    
+
     // Swap
     void swap(Rec2DEdge*, Rec2DEdge*);
     void swapMVertex(Rec2DVertex*, Rec2DVertex*);
-    
+
     // Quality
     inline int getAngleWeight() const {
       return _numEdge > 3 ? Recombine2D::getWeightAngleQuad() : Recombine2D::getWeightAngleTri();
@@ -1058,7 +1058,7 @@ class Rec2DElement {
     inline double getWeightedAngleQual(const Rec2DVertex *v) const {
       return getAngleWeight() * getAngleQual(v);
     }
-    
+
     // Miscellaneous
     inline int getNum() const {return _mEl->getNum();}
     inline bool isTri() const {return _numEdge == 3;}
@@ -1084,14 +1084,14 @@ class Rec2DElement {
       return NULL;
     }
 #endif
-    
+
     // Check errors
     bool checkCoherence() const;
-    
+
     // Debug
     void print() const;
     void createElement(double shiftx, double shifty) const;
-    
+
   private :
     MQuadrangle* _createQuad() const;
 };
@@ -1242,26 +1242,26 @@ class Rec2DNode {
     // seq = from son to end of horizon/tree
     double _reward, _globalQuality, _bestSeqReward, _expectedSeqReward;
     std::vector<Rec2DAction*> *_createdActions;
-    
+
     bool _notAllQuad; // For only recombinations
-    
+
   public :
     Rec2DNode(Rec2DNode *father, Rec2DAction*, int depth = -1);
     ~Rec2DNode();
-    
+
     // Get methods
     inline double getReward() const {return _reward;}
     inline Rec2DAction* getAction() const {return _ra;}
     inline Rec2DNode* getFather() const {return _father;}
-    
+
     // Process the tree
     void lookahead(int depth);
     static Rec2DNode* selectBestNode(Rec2DNode*);
-    
+
     // Make/Revert changes
     bool makeChanges();
     bool revertChanges();
-    
+
     // Miscellaneous
     bool operator<(Rec2DNode&);
     bool canBeDeleted() const;
@@ -1269,7 +1269,7 @@ class Rec2DNode {
     inline bool notInSubTree() const {return hasOneSon() && _son[0]->_depth == _depth;}
     inline bool hasOneSon() const {return _son[0] && !_son[1];}
     inline Rec2DNode* getSon() const {return _son[0];}
-    
+
     // Debug
     void draw(double dx, double dy) {
       if (_father)
@@ -1282,13 +1282,13 @@ class Rec2DNode {
     }
     void printIdentity() const;
     void printSequence() const;
-    
+
   private:
     // Process the tree
     void _makeDevelopments(int depth);
     void _createSons(const std::vector<Rec2DAction*>&, int depth);
     void _develop(int depth);
-    
+
     // Operators on Sons
     inline bool _hasSons() const {return _son[0];}
     /*bool _hasSon(Rec2DNode *n) {
@@ -1301,15 +1301,15 @@ class Rec2DNode {
     void _delSons(bool alsoFirst);
     void _orderSons();
     bool _rmvSon(Rec2DNode *n);
-    
+
     // Operators on Father
     void _rmvFather(Rec2DNode *n);
-    
+
     // Reward
     inline double _getExpectedSeqReward() {return _reward + _expectedSeqReward;}
     inline double _getBestSequenceReward() {return _reward + _bestSeqReward;}
     inline double _getGlobQual() const {return _globalQuality + _reward;}
-    
+
     // Miscellaneous
     void _mkChgSinceBeginning() {
       if (_father)
@@ -1326,55 +1326,3 @@ class Rec2DNode {
 };
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Mesh/meshGFaceTransfinite.cpp b/Mesh/meshGFaceTransfinite.cpp
index f31f99bb13d0c91170d2252c21b5c454aa22e986..0b038440771ac783949d77a997ca264e2db041ea 100644
--- a/Mesh/meshGFaceTransfinite.cpp
+++ b/Mesh/meshGFaceTransfinite.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <map>
 #include "meshGFace.h"
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index 5373572421341f0c80f677b15aa1d5522339a8dd..ca00240b669fc9ab67044c4dcb6a786077f23a38 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <vector>
diff --git a/Mesh/meshGRegion.h b/Mesh/meshGRegion.h
index f514df0dd521048c41c5a1b4cf7b612f08854748..25f12794bf80024d06a1a804e77db1550a2152ce 100644
--- a/Mesh/meshGRegion.h
+++ b/Mesh/meshGRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GREGION_H_
 #define _MESH_GREGION_H_
diff --git a/Mesh/meshGRegion19036.cpp b/Mesh/meshGRegion19036.cpp
index 24327daca32d81c8fda48d183c8225d5921e077a..bbf6ba03083e66c2df88f0fbdcaa3c21e3a72bd3 100644
--- a/Mesh/meshGRegion19036.cpp
+++ b/Mesh/meshGRegion19036.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <vector>
diff --git a/Mesh/meshGRegionBoundaryRecovery.cpp b/Mesh/meshGRegionBoundaryRecovery.cpp
index c13f8c033fea7520f72f56a44222537d8573d997..7edb97b04a3824ca3fbf586c14f498b4ce5c689e 100644
--- a/Mesh/meshGRegionBoundaryRecovery.cpp
+++ b/Mesh/meshGRegionBoundaryRecovery.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Hang Si
 
diff --git a/Mesh/meshGRegionBoundaryRecovery.h b/Mesh/meshGRegionBoundaryRecovery.h
index 4544cf592708c447d94ac15a3128d8dd87d75274..0023617e71b7ae7486df23a8fa3146aebab6dbe0 100644
--- a/Mesh/meshGRegionBoundaryRecovery.h
+++ b/Mesh/meshGRegionBoundaryRecovery.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GREGION_BOUNDARY_RECOVERY_H_
 #define _MESH_GREGION_BOUNDARY_RECOVERY_H_
diff --git a/Mesh/meshGRegionCarveHole.cpp b/Mesh/meshGRegionCarveHole.cpp
index cbf47d2014ee4c2bb08278113db983e978396040..1e7502772077758e47f49fd9ee47025b125b24f2 100644
--- a/Mesh/meshGRegionCarveHole.cpp
+++ b/Mesh/meshGRegionCarveHole.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "GmshConfig.h"
diff --git a/Mesh/meshGRegionDelaunayInsertion.cpp b/Mesh/meshGRegionDelaunayInsertion.cpp
index 6e37e26a5f2763be8548b018b300b0ee625fc98e..3014ccefb87cef1d00ebad163dd8df3b2fc9f790 100644
--- a/Mesh/meshGRegionDelaunayInsertion.cpp
+++ b/Mesh/meshGRegionDelaunayInsertion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include <map>
diff --git a/Mesh/meshGRegionDelaunayInsertion.h b/Mesh/meshGRegionDelaunayInsertion.h
index 4ca146d29db49a9a86e0a6563951416d651e70b7..88af9966f4e0aefe18ec4c014eda725b7be08a0b 100644
--- a/Mesh/meshGRegionDelaunayInsertion.h
+++ b/Mesh/meshGRegionDelaunayInsertion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GREGION_DELAUNAY_INSERTION_H_
 #define _MESH_GREGION_DELAUNAY_INSERTION_H_
diff --git a/Mesh/meshGRegionExtruded.cpp b/Mesh/meshGRegionExtruded.cpp
index 4203479544bdc0e89ed6f1bf0972ad851caa06d5..e64ee51ef4456c3627bf1320d528aab241b70a09 100644
--- a/Mesh/meshGRegionExtruded.cpp
+++ b/Mesh/meshGRegionExtruded.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "GModel.h"
diff --git a/Mesh/meshGRegionLocalMeshMod.cpp b/Mesh/meshGRegionLocalMeshMod.cpp
index adb2c32ca77616098d0afd0d44e45fa71bc7664e..9c40a8f0f00eaa2882f41104675f2ae4d6773ef9 100644
--- a/Mesh/meshGRegionLocalMeshMod.cpp
+++ b/Mesh/meshGRegionLocalMeshMod.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "meshGRegionLocalMeshMod.h"
 #include "GEntity.h"
diff --git a/Mesh/meshGRegionLocalMeshMod.h b/Mesh/meshGRegionLocalMeshMod.h
index 323b1b30b2199277c5049b2af84a19cb917d2406..53f02b481dcc3ee9fb20e08f62c0607aef22baf1 100644
--- a/Mesh/meshGRegionLocalMeshMod.h
+++ b/Mesh/meshGRegionLocalMeshMod.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GREGION_LOCAL_MESH_MOD_H_
 #define _MESH_GREGION_LOCAL_MESH_MOD_H_
diff --git a/Mesh/meshGRegionMMG3D.cpp b/Mesh/meshGRegionMMG3D.cpp
index 114351bb355301d0d80de1d319e59bcb6b15afcd..01c62fb97e9fbc7e7435f5016f0cea07adfa889e 100644
--- a/Mesh/meshGRegionMMG3D.cpp
+++ b/Mesh/meshGRegionMMG3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Mesh/meshGRegionMMG3D.h b/Mesh/meshGRegionMMG3D.h
index 08d598c18d164957054a3cacb08cb30865dfebfb..e13258d7ef11eecd1dbd0edf6bf1e58ee616297a 100644
--- a/Mesh/meshGRegionMMG3D.h
+++ b/Mesh/meshGRegionMMG3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESHGREGIONMMG3D_H_
 #define _MESHGREGIONMMG3D_H_
diff --git a/Mesh/meshGRegionTransfinite.cpp b/Mesh/meshGRegionTransfinite.cpp
index c71092d3a04a30e3bd27802c7ae6ab993598df72..2e263e6cf2176574a0a7882d315a45a10d0250a4 100644
--- a/Mesh/meshGRegionTransfinite.cpp
+++ b/Mesh/meshGRegionTransfinite.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Trevor S. Strickler
diff --git a/Mesh/meshMetric.cpp b/Mesh/meshMetric.cpp
index 4e05d87fcb00fadfcd34e0db458a955f75e48d0e..2381a85d87a3b3f62fc608458b74876d3a7a3e1b 100644
--- a/Mesh/meshMetric.cpp
+++ b/Mesh/meshMetric.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "meshMetric.h"
 #include "meshGFaceOptimize.h"
diff --git a/Mesh/meshMetric.h b/Mesh/meshMetric.h
index 5a732022da45aa9813db5494f0e6768de08bb7a7..82918aa88c96ade417f58a57045bf37cc48bf5fb 100644
--- a/Mesh/meshMetric.h
+++ b/Mesh/meshMetric.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_METRIC_H_
 #define _MESH_METRIC_H_
diff --git a/Mesh/meshPartition.cpp b/Mesh/meshPartition.cpp
index 94f143a679019beec3ba646e7ab4f5f33341983d..5f0cd21d564dbda1634cc5f027feb44b2acbc09b 100644
--- a/Mesh/meshPartition.cpp
+++ b/Mesh/meshPartition.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Partition.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Mesh/meshPartition.h b/Mesh/meshPartition.h
index e8b1c14d761165d7c688d07df207d6a2d00d0203..4bffa008e2fd5d165bd33fd91284c782cda4b900 100644
--- a/Mesh/meshPartition.h
+++ b/Mesh/meshPartition.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_PARTITION_H_
 #define _MESH_PARTITION_H_
diff --git a/Mesh/meshPartitionObjects.h b/Mesh/meshPartitionObjects.h
index 059447bcbd18b99427c86b5db3e12ae0925bcb82..f73c77c8502df995a751a14b0d297f5747e08cab 100644
--- a/Mesh/meshPartitionObjects.h
+++ b/Mesh/meshPartitionObjects.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_PARTITION_OBJECTS_H_
 #define _MESH_PARTITION_OBJECTS_H_
diff --git a/Mesh/meshPartitionOptions.h b/Mesh/meshPartitionOptions.h
index 7ec609e7af495582cdb3cb09888c1eb892ecdb69..134a2e4736382eb6b7ee7899a668447a3c5fab7f 100644
--- a/Mesh/meshPartitionOptions.h
+++ b/Mesh/meshPartitionOptions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_PARTITION_OPTIONS_H_
 #define _MESH_PARTITION_OPTIONS_H_
diff --git a/Mesh/meshRecombine2D.cpp b/Mesh/meshRecombine2D.cpp
index 244a8fc4ac1ba1f4877170d3a78fc679adbe8052..6df5959ff2b4560b7281d69395c9d203fc4cf1d6 100644
--- a/Mesh/meshRecombine2D.cpp
+++ b/Mesh/meshRecombine2D.cpp
@@ -1,7 +1,7 @@
-// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Amaury Johnen, adapted from meshGFaceOptimize
diff --git a/Mesh/meshRecombine2D_2.cpp b/Mesh/meshRecombine2D_2.cpp
index 6fe83b6c37d2a877250ebd4b170f9f7d2c37b776..20abf4208379c64c8af2a194eee54a15f9557712 100644
--- a/Mesh/meshRecombine2D_2.cpp
+++ b/Mesh/meshRecombine2D_2.cpp
@@ -1,7 +1,7 @@
-// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Amaury Johnen, adapted from meshGFaceOptimize
diff --git a/Mesh/meshRefine.cpp b/Mesh/meshRefine.cpp
index 7fba18afe79f17f3ae2f644c0c72e1103e5d611e..91326339f495d8074a32720b00c3e020695b050f 100644
--- a/Mesh/meshRefine.cpp
+++ b/Mesh/meshRefine.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Brian Helenbrook
diff --git a/Mesh/multiscalePartition.cpp b/Mesh/multiscalePartition.cpp
index c24bc742ce72265ee0bf4538f51ac1c9b079d614..3cc8bd46097fb1edd826ec496580b2780d4a49b9 100644
--- a/Mesh/multiscalePartition.cpp
+++ b/Mesh/multiscalePartition.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Mesh/multiscalePartition.h b/Mesh/multiscalePartition.h
index 216b255cb492ecde0a110067677ae9fd22e70c81..b38842b1a1ac590fda2c5085d902965e836ded17 100644
--- a/Mesh/multiscalePartition.h
+++ b/Mesh/multiscalePartition.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Mesh/periodical.cpp b/Mesh/periodical.cpp
index afc927ba2580ddbad3b49160ef9855d5b167a5cd..671d104215e73eb77833d24abd7d07dcaa5b671f 100644
--- a/Mesh/periodical.cpp
+++ b/Mesh/periodical.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier Maxime Melchior
diff --git a/Mesh/periodical.h b/Mesh/periodical.h
index c56c96fbe66f700da25d790768cd91363ee718a7..60144ad7126df8bde8063671961dd5147f3569a6 100644
--- a/Mesh/periodical.h
+++ b/Mesh/periodical.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier Maxime Melchior
diff --git a/Mesh/pointInsertion.cpp b/Mesh/pointInsertion.cpp
index 7497dee25d34acbe1f8be502e0c656eb66a89abb..d363382607cf544c21d0f4b7e1353cbe02cdfa61 100644
--- a/Mesh/pointInsertion.cpp
+++ b/Mesh/pointInsertion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Mesh/pointInsertion.h b/Mesh/pointInsertion.h
index 4d3a9ec8c8753185e4feecf4d386093793203a5b..6b649dc8f4578af02677f5f165aca0f875db09d7 100644
--- a/Mesh/pointInsertion.h
+++ b/Mesh/pointInsertion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 
 #ifndef _POINTINSERTION_H_
diff --git a/Mesh/pointInsertionRTreeTools.cpp b/Mesh/pointInsertionRTreeTools.cpp
index 4ed9b22e6a7f1feda575f17863936dbc63a0a43b..b43a747f4c105bad1bd09d870f330cec9c685286 100644
--- a/Mesh/pointInsertionRTreeTools.cpp
+++ b/Mesh/pointInsertionRTreeTools.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Tristan Carrier and Paul-Emile Bernard
 
diff --git a/Mesh/pointInsertionRTreeTools.h b/Mesh/pointInsertionRTreeTools.h
index a4bb441437c0beb076fd1db94a5ccaa7a329e883..d8f950d3d7f79b2d74bf1d878503c27c25376cba 100644
--- a/Mesh/pointInsertionRTreeTools.h
+++ b/Mesh/pointInsertionRTreeTools.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Tristan Carrier and Paul-Emile Bernard
 
diff --git a/Mesh/qualityMeasures.cpp b/Mesh/qualityMeasures.cpp
index 5d343b4b508b892a449ce8809f6aeadb9c2b6a3d..4dd307a507a425ff726ded51b4bb1c1e9c8dade1 100644
--- a/Mesh/qualityMeasures.cpp
+++ b/Mesh/qualityMeasures.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "qualityMeasures.h"
 #include "BDS.h"
diff --git a/Mesh/qualityMeasures.h b/Mesh/qualityMeasures.h
index f84bbd8686f6c2c9e28423e6913783a9402cda5e..7b713177e40c0ece4fc471ecd1f37d6364459655 100644
--- a/Mesh/qualityMeasures.h
+++ b/Mesh/qualityMeasures.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _QUALITY_MEASURES_H_
 #define _QUALITY_MEASURES_H_
diff --git a/Mesh/simple3D.cpp b/Mesh/simple3D.cpp
index af306b7a0bdc75d42ffcaa877c6d8b43a1e0cd7e..2cee003ee5214b1ffd0d3f35427662c320a5d712 100644
--- a/Mesh/simple3D.cpp
+++ b/Mesh/simple3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier François Henrotte
diff --git a/Mesh/simple3D.h b/Mesh/simple3D.h
index 39e28f4950f388ef0d8c683d8aea8ea900d8a468..4fc4889d53aef2c1f22f2642aa3cf830090ce17e 100644
--- a/Mesh/simple3D.h
+++ b/Mesh/simple3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier François Henrotte
diff --git a/Mesh/surfaceFiller.cpp b/Mesh/surfaceFiller.cpp
index d352c5bf98a332bd30183001370d364da9037e7b..cc4192043dfcb59ca3f2dbe1e03e81f07fd39965 100644
--- a/Mesh/surfaceFiller.cpp
+++ b/Mesh/surfaceFiller.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier Baudoin
diff --git a/Mesh/surfaceFiller.h b/Mesh/surfaceFiller.h
index ea117c69aeb5afb9f7afe1f7dbf4896c2bafd085..9e0ee0ce3ce555c45f6e3eca9787c885645b60bf 100644
--- a/Mesh/surfaceFiller.h
+++ b/Mesh/surfaceFiller.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 
 #ifndef _SURFACEFILLER_H_
diff --git a/Mesh/yamakawa.cpp b/Mesh/yamakawa.cpp
index 95d584001410230152dc1fff6e92097de9918474..f78f3a6bff9f6a0bf53697683613e2415b497e57 100644
--- a/Mesh/yamakawa.cpp
+++ b/Mesh/yamakawa.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Tristan Carrier and Paul-Emile Bernard
 
diff --git a/Mesh/yamakawa.h b/Mesh/yamakawa.h
index 1bca2c837cad77489831843160c998b8ea305fb8..e4aa8c9e71bdb4d2369c0923d4e02f1734c22232 100644
--- a/Mesh/yamakawa.h
+++ b/Mesh/yamakawa.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Tristan Carrier
 
diff --git a/Numeric/BasisFactory.cpp b/Numeric/BasisFactory.cpp
index a265c36db9f85eea24688ae8c2603bbb78b6ec49..97ed21a7e176404cf6e2c5ad254b5c9b52ed767e 100644
--- a/Numeric/BasisFactory.cpp
+++ b/Numeric/BasisFactory.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-B-> Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BasisFactory.h"
 #include "GmshDefines.h"
diff --git a/Numeric/BasisFactory.h b/Numeric/BasisFactory.h
index f97a1dc86111d84aa07c12b44388791cfafc3007..c75bcd2e4dba6b05eb2ed7d8dfc1e784cc913463 100644
--- a/Numeric/BasisFactory.h
+++ b/Numeric/BasisFactory.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef BASISFACTORY_H
 #define BASISFACTORY_H
diff --git a/Numeric/BergotBasis.cpp b/Numeric/BergotBasis.cpp
index eb9794688344146efa0c7750a7c4a23449f547fd..a3eb3fd16d5a1935dbfa7f202c96c644c3d27c19 100644
--- a/Numeric/BergotBasis.cpp
+++ b/Numeric/BergotBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <cmath>
 #include "BergotBasis.h"
diff --git a/Numeric/BergotBasis.h b/Numeric/BergotBasis.h
index 11f9b27a27107a4324e6f6aea2ad183eb7bd3040..1f381e0d835e71dd540f4fa648c7fc8e4e780eb9 100644
--- a/Numeric/BergotBasis.h
+++ b/Numeric/BergotBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef BERGOTBASIS_H
 #define BERGOTBASIS_H
diff --git a/Numeric/CMakeLists.txt b/Numeric/CMakeLists.txt
index 1b91546640b61099ce93965e3d4948e629fe4a9c..e30801bb8e2a37226a559663121d13ef6c2f563e 100644
--- a/Numeric/CMakeLists.txt
+++ b/Numeric/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Numeric.cpp
diff --git a/Numeric/CondNumBasis.cpp b/Numeric/CondNumBasis.cpp
index 9ec41ce4d4d9d45d42d07a6b405790620f9db586..2a514f962c9b63671528de6f003fa889d56ba660 100644
--- a/Numeric/CondNumBasis.cpp
+++ b/Numeric/CondNumBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "CondNumBasis.h"
 
diff --git a/Numeric/CondNumBasis.h b/Numeric/CondNumBasis.h
index d518a431f3d41ce51fd46e736581fe3344ebf14f..82a735996017370eaa132ec7d48b4f4285e0c475 100644
--- a/Numeric/CondNumBasis.h
+++ b/Numeric/CondNumBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CONDNUMBASIS_H_
 #define _CONDNUMBASIS_H_
diff --git a/Numeric/ConjugateGradients.cpp b/Numeric/ConjugateGradients.cpp
index 62e7905c133cf6c572d33f8cc240dbfdb4b05aa9..3a607be928ed6e3436336fc99cde6e2465d032d6 100644
--- a/Numeric/ConjugateGradients.cpp
+++ b/Numeric/ConjugateGradients.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include <math.h>
diff --git a/Numeric/ConjugateGradients.h b/Numeric/ConjugateGradients.h
index f6130e535beab4d0418b11a64c2f052214c7606c..24ae315ac7791879f9129b39328e2d52ac3ecbe4 100644
--- a/Numeric/ConjugateGradients.h
+++ b/Numeric/ConjugateGradients.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef  _CONJUGATEGRADIENTS
 #define  _CONJUGATEGRADIENTS
diff --git a/Numeric/ElementType.cpp b/Numeric/ElementType.cpp
index b0d378051915bee1c67c074de3fe11031ed0178e..85154f66fbf576a3394401bd70c2c87a47bbf0e1 100644
--- a/Numeric/ElementType.cpp
+++ b/Numeric/ElementType.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "ElementType.h"
 #include "GmshDefines.h"
diff --git a/Numeric/ElementType.h b/Numeric/ElementType.h
index 074c2a9e8665a769a30a3376160507cc9cbebf3d..c8e2ef955a89328d162460f52359975aaff6a9e9 100644
--- a/Numeric/ElementType.h
+++ b/Numeric/ElementType.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ELEMENTTYPE_H_
 #define _ELEMENTTYPE_H_
diff --git a/Numeric/FuncSpaceData.cpp b/Numeric/FuncSpaceData.cpp
index f635dc5cfb31caa62eb9dc162e8b01b861461fe7..8ad36a65943f5ed947c17f78c1699f80c260286c 100644
--- a/Numeric/FuncSpaceData.cpp
+++ b/Numeric/FuncSpaceData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-B-> Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "FuncSpaceData.h"
 #include "MElement.h"
diff --git a/Numeric/FuncSpaceData.h b/Numeric/FuncSpaceData.h
index 05334a6e9092377935a3dfaccfe37625a0d0f52f..fbc55f6d0f18a722c51ee6dc6329bf9a4755c623 100644
--- a/Numeric/FuncSpaceData.h
+++ b/Numeric/FuncSpaceData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef FUNCSPACEDATA_H
 #define FUNCSPACEDATA_H
diff --git a/Numeric/GaussIntegration.cpp b/Numeric/GaussIntegration.cpp
index 637d66edf30026731d4cd5d3c793bae55e128d3c..3ffca3da97218a908232b4693c1725c8b5936d13 100644
--- a/Numeric/GaussIntegration.cpp
+++ b/Numeric/GaussIntegration.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GmshDefines.h"
diff --git a/Numeric/GaussIntegration.h b/Numeric/GaussIntegration.h
index dcdc5c308087465eb2a8f5e9baec9aeb047fa7c2..b841629a3d142737719181a2008e0b5a7b49f3a5 100644
--- a/Numeric/GaussIntegration.h
+++ b/Numeric/GaussIntegration.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GAUSS_INTEGRATION_H_
 #define _GAUSS_INTEGRATION_H_
diff --git a/Numeric/GaussJacobi1D.cpp b/Numeric/GaussJacobi1D.cpp
index cc85d546af6d1a15d1280f0ed267b811e9c27ea3..f81ad323b5ffe229a274eae9c3898a9cf536a29a 100644
--- a/Numeric/GaussJacobi1D.cpp
+++ b/Numeric/GaussJacobi1D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // code to generate this file (using alglib) :
 #if 0
diff --git a/Numeric/GaussJacobi1D.h b/Numeric/GaussJacobi1D.h
index 47e3fbe3e7a0f7d4aa6a93edc1c95b9f7e364df6..f3d79d938aeade5aee7a3e36ddf62d92b604a437 100644
--- a/Numeric/GaussJacobi1D.h
+++ b/Numeric/GaussJacobi1D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GAUSS_JACOBI_1D_H_
 #define _GAUSS_JACOBI_1D_H_
diff --git a/Numeric/GaussLegendre1D.h b/Numeric/GaussLegendre1D.h
index cc7fed3e67007e7a118db83967179e7a268c616b..db192f1ccfbaba1c5ab9ec9b9f767ec05ff642a2 100644
--- a/Numeric/GaussLegendre1D.h
+++ b/Numeric/GaussLegendre1D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 /* 1 point rule points */
 static double _GL_pt1[1]={
diff --git a/Numeric/GaussLegendreSimplex.cpp b/Numeric/GaussLegendreSimplex.cpp
index b74c50d9ae4da2874fe0f054c5883110673b4ab4..256ee63e164b0ce016e7e9a23c986a4b293a6d26 100644
--- a/Numeric/GaussLegendreSimplex.cpp
+++ b/Numeric/GaussLegendreSimplex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GaussIntegration.h"
diff --git a/Numeric/GaussQuadratureHex.cpp b/Numeric/GaussQuadratureHex.cpp
index c555842dc0f9d6daa0abc6b751ae41be0569b120..7d451ea0f38960993d3f151e5bd4afb47b5c7f15 100644
--- a/Numeric/GaussQuadratureHex.cpp
+++ b/Numeric/GaussQuadratureHex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/GaussQuadratureLin.cpp b/Numeric/GaussQuadratureLin.cpp
index 852236448943ee2cc51ebee80d5ec56e39454589..e2e15d441eba33075090043b12636f4f2627883b 100644
--- a/Numeric/GaussQuadratureLin.cpp
+++ b/Numeric/GaussQuadratureLin.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/GaussQuadraturePri.cpp b/Numeric/GaussQuadraturePri.cpp
index cd398a92b23c6b6282e91f005b91d13aa8a9fa3d..b34daa27f09ffb483a65261fc26db12ce6185492 100644
--- a/Numeric/GaussQuadraturePri.cpp
+++ b/Numeric/GaussQuadraturePri.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "GaussIntegration.h"
diff --git a/Numeric/GaussQuadraturePyr.cpp b/Numeric/GaussQuadraturePyr.cpp
index 747163864a2c09377dd600ca874d0f3fe4b5dfbb..ffa17d9b4618bd57df8d91f99e585b7ce93546e7 100644
--- a/Numeric/GaussQuadraturePyr.cpp
+++ b/Numeric/GaussQuadraturePyr.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "GaussIntegration.h"
diff --git a/Numeric/GaussQuadratureQuad.cpp b/Numeric/GaussQuadratureQuad.cpp
index bd6574c8f98811c1106bd6fe2780e675f2223e13..3565bc257bc2b396af8856e80d0c8ee6638aa982 100644
--- a/Numeric/GaussQuadratureQuad.cpp
+++ b/Numeric/GaussQuadratureQuad.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/GaussQuadratureTet.cpp b/Numeric/GaussQuadratureTet.cpp
index 442c4ebd0fd8ecfaa1f3fd1d5b0fcd45f004164a..e44f319f0494d66edc93958772c65d431676c7bc 100644
--- a/Numeric/GaussQuadratureTet.cpp
+++ b/Numeric/GaussQuadratureTet.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/GaussQuadratureTri.cpp b/Numeric/GaussQuadratureTri.cpp
index ff18ad321e78b77b0931ee071f1c7db2640e9956..7e2e14771647818570067bbfdacb913f610b9bdd 100644
--- a/Numeric/GaussQuadratureTri.cpp
+++ b/Numeric/GaussQuadratureTri.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/HilbertCurve.cpp b/Numeric/HilbertCurve.cpp
index 59b24bf48b990dfc91c2ad08b6aee7eca496b688..e74d05909dee24cae93b6e6c573b4a2778bb956f 100644
--- a/Numeric/HilbertCurve.cpp
+++ b/Numeric/HilbertCurve.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "SBoundingBox3d.h"
 #include "MVertex.h"
diff --git a/Numeric/HilbertCurve.h b/Numeric/HilbertCurve.h
index f2cafef809b0dd7ff2df71bc97a61cf6ff3a2573..c7d700221895e171f962ad8bd8f18fa4496406bf 100644
--- a/Numeric/HilbertCurve.h
+++ b/Numeric/HilbertCurve.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HILBERT_CURVE_
 #define _HILBERT_CURVE_
diff --git a/Numeric/Iso.cpp b/Numeric/Iso.cpp
index 18646939a69a2885e669cc388d3e274bc7ac96d6..1917d97c676147fca96673aed79ac835e85d7584 100644
--- a/Numeric/Iso.cpp
+++ b/Numeric/Iso.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Numeric.h"
 
diff --git a/Numeric/Iso.h b/Numeric/Iso.h
index f729fac0273fd5155fd9258bcf8006f7bbcea2ca..4bd3cb4c9db786c757e1351d1e66d1d6cf57be4a 100644
--- a/Numeric/Iso.h
+++ b/Numeric/Iso.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ISO_H_
 #define _ISO_H_
diff --git a/Numeric/JacobianBasis.cpp b/Numeric/JacobianBasis.cpp
index 9e41565be7502b49d7b09538347fdeba5cba7a02..1b3ef74eae642479b08719cb4bbd353acb985141 100644
--- a/Numeric/JacobianBasis.cpp
+++ b/Numeric/JacobianBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "JacobianBasis.h"
 #include "pointsGenerators.h"
diff --git a/Numeric/JacobianBasis.h b/Numeric/JacobianBasis.h
index 5ebf2f7b79e7c9b8185dbb585c7bfd006a0f3c47..501f7abf39806c0e0f81bb61d4ca1e93e59225d1 100644
--- a/Numeric/JacobianBasis.h
+++ b/Numeric/JacobianBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _JACOBIAN_BASIS_H_
 #define _JACOBIAN_BASIS_H_
diff --git a/Numeric/MetricBasis.cpp b/Numeric/MetricBasis.cpp
index c53a1e8f30b600eda0a07ecf20eaa01a0620ffa8..e651597fc568a9cece0df5410811039bc8f6839b 100644
--- a/Numeric/MetricBasis.cpp
+++ b/Numeric/MetricBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MElement.h"
 #include "AnalyseCurvedMesh.h"
diff --git a/Numeric/MetricBasis.h b/Numeric/MetricBasis.h
index 851d547c08fc19c31da2e25d00c879e14afb30e8..0764f76811178fadeceb90835672609d35a48eb0 100644
--- a/Numeric/MetricBasis.h
+++ b/Numeric/MetricBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _METRIC_BASIS_H_
 #define _METRIC_BASIS_H_
diff --git a/Numeric/Numeric.cpp b/Numeric/Numeric.cpp
index bf55db439cdf3abea8743ef4dead3761483320c2..51f2b6bcd1e4eed98a4c55c33a350ee5ccd80016 100644
--- a/Numeric/Numeric.cpp
+++ b/Numeric/Numeric.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "GmshConfig.h"
diff --git a/Numeric/Numeric.h b/Numeric/Numeric.h
index 6aaf065ecc8ab11ecd678049761c398eda4cacee..435a89932f460aac363dae45298e5bc7b1cb4e87 100644
--- a/Numeric/Numeric.h
+++ b/Numeric/Numeric.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _NUMERIC_H_
 #define _NUMERIC_H_
diff --git a/Numeric/approximationError.cpp b/Numeric/approximationError.cpp
index 4e0c5219c96b6195c812d6e8f05ae9c0462b3133..8ae3db92d10d67091c69851ce723ce3ead319171 100644
--- a/Numeric/approximationError.cpp
+++ b/Numeric/approximationError.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "approximationError.h"
 #include "MElement.h"
diff --git a/Numeric/approximationError.h b/Numeric/approximationError.h
index 2437cba0af2796e675127b4a88c45cf8bbde9155..efe7d9888482a31540b91da93c2b2be2a143e629 100644
--- a/Numeric/approximationError.h
+++ b/Numeric/approximationError.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _APPROXIMATION_ERROR_
 #define _APPROXIMATION_ERROR_
diff --git a/Numeric/bezierBasis.cpp b/Numeric/bezierBasis.cpp
index 5484b1df0276ce49445538d7d5ccefa7ef19b3fd..34e916b8082c3171bd3b2a1c7bc44ff1e82042d8 100644
--- a/Numeric/bezierBasis.cpp
+++ b/Numeric/bezierBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "GmshDefines.h"
diff --git a/Numeric/bezierBasis.h b/Numeric/bezierBasis.h
index 9bb522f804b2c418480bd394ad99fd4cd24ce801..19ef6a5bdec77babd30fc306750e0d1c038dc330 100644
--- a/Numeric/bezierBasis.h
+++ b/Numeric/bezierBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BEZIER_BASIS_H_
 #define _BEZIER_BASIS_H_
diff --git a/Numeric/cartesian.h b/Numeric/cartesian.h
index 3eeb9bd17d327add16d0b7eec87fb4b76a14e44c..db43677f4d539aa5ee08f899c2cbe4a28205fa48 100644
--- a/Numeric/cartesian.h
+++ b/Numeric/cartesian.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CARTESIAN_H_
 #define _CARTESIAN_H_
diff --git a/Numeric/decasteljau.cpp b/Numeric/decasteljau.cpp
index b5369b3b844edb18900b7e246f79d646364c4112..304057bc200ae5662e4e08c7172449ef0898a1dd 100644
--- a/Numeric/decasteljau.cpp
+++ b/Numeric/decasteljau.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by J. Lambrechts
 
diff --git a/Numeric/decasteljau.h b/Numeric/decasteljau.h
index 1e82ff54deed3d58f1b903fe3e88ce0ff6e236b9..16cb2eee961a0eec7d1cb84def9cec99168c93f8 100644
--- a/Numeric/decasteljau.h
+++ b/Numeric/decasteljau.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by J. Lambrechts
 
diff --git a/Numeric/discreteFrechetDistance.cpp b/Numeric/discreteFrechetDistance.cpp
index 8d00c044056f485c3a4a171b50dd475d7ecb6e51..5d5c3e55ebb4e8213ed45ba4e0c731182c802a0f 100644
--- a/Numeric/discreteFrechetDistance.cpp
+++ b/Numeric/discreteFrechetDistance.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "discreteFrechetDistance.h"
diff --git a/Numeric/discreteFrechetDistance.h b/Numeric/discreteFrechetDistance.h
index 0f149a5e2f89c2294dbee11929ad4d3a406c411d..8014e2f3d8d89fe5289339067f1e95e3e6cb2707 100644
--- a/Numeric/discreteFrechetDistance.h
+++ b/Numeric/discreteFrechetDistance.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_FRECHET_DISTANCE_
 #define _DISCRETE_FRECHET_DISTANCE_
diff --git a/Numeric/fullMatrix.cpp b/Numeric/fullMatrix.cpp
index e4e87624dc1d724de24888d7e8834fe74084203a..e95c99eb27259cb70be9ee934ad69cd6e2e21fe6 100644
--- a/Numeric/fullMatrix.cpp
+++ b/Numeric/fullMatrix.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <complex>
 #include <string.h>
diff --git a/Numeric/fullMatrix.h b/Numeric/fullMatrix.h
index 188378502849da88653eb3ef3b02d69d86e5ea28..bdee20667ed88fa12f12746c38f119685477c559 100644
--- a/Numeric/fullMatrix.h
+++ b/Numeric/fullMatrix.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FULL_MATRIX_H_
 #define _FULL_MATRIX_H_
diff --git a/Numeric/hausdorffDistance.cpp b/Numeric/hausdorffDistance.cpp
index cb9d21ea61f00f7636c04e63b764a4dcf507f083..8c747af381d2252f9d441faeaf67f2f45797bb8e 100644
--- a/Numeric/hausdorffDistance.cpp
+++ b/Numeric/hausdorffDistance.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 /*
   compute the hausdorff distance between two polygonal curves
diff --git a/Numeric/jacobiPolynomials.cpp b/Numeric/jacobiPolynomials.cpp
index c89cfb896cc42948e7bc7b3e3f7a68378fde716c..f942b110ee36d68c4cb3b9cbb196efcda218fecb 100644
--- a/Numeric/jacobiPolynomials.cpp
+++ b/Numeric/jacobiPolynomials.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include <cmath>
diff --git a/Numeric/jacobiPolynomials.h b/Numeric/jacobiPolynomials.h
index 71a950fb236b34e6f1a53bafd8912cd3d07254dc..67886df7819467915bdc75baf19a37a89afbea66 100644
--- a/Numeric/jacobiPolynomials.h
+++ b/Numeric/jacobiPolynomials.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef JACOBIPOLYNOMIALS_H
 #define JACOBIPOLYNOMIALS_H
diff --git a/Numeric/legendrePolynomials.cpp b/Numeric/legendrePolynomials.cpp
index 580f3570fab639c3c047a978ebac58382516f6de..cb7721cd605996c81b98ac6c8e8f12aa5d81d6b0 100644
--- a/Numeric/legendrePolynomials.cpp
+++ b/Numeric/legendrePolynomials.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "legendrePolynomials.h"
 
diff --git a/Numeric/legendrePolynomials.h b/Numeric/legendrePolynomials.h
index 38d94314cbe7ebecec3d02d4f243989372abf250..df574140d00001bc209e05ee52ed8b1c5320da26 100644
--- a/Numeric/legendrePolynomials.h
+++ b/Numeric/legendrePolynomials.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef LEGENDREPOLYNOMIALS_H
 #define LEGENDREPOLYNOMIALS_H
diff --git a/Numeric/mathEvaluator.cpp b/Numeric/mathEvaluator.cpp
index 74b750a50365858d7ff895dbd657a45208ea327a..d8fb48df9a473b7cc2db886be97d8c097ece5c06 100644
--- a/Numeric/mathEvaluator.cpp
+++ b/Numeric/mathEvaluator.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "mathEvaluator.h"
 
diff --git a/Numeric/mathEvaluator.h b/Numeric/mathEvaluator.h
index 90592935cdc869f1610a5b13834ba35b2943475c..d129eca385d2ede477bc88a92d3088b49c0c8cad 100644
--- a/Numeric/mathEvaluator.h
+++ b/Numeric/mathEvaluator.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MATH_EVALUATOR_H_
 #define _MATH_EVALUATOR_H_
diff --git a/Numeric/miniBasis.cpp b/Numeric/miniBasis.cpp
index ca7789a34ab7c640fc74cc80c94583fb3679cbeb..d2bd3d798f00c9e1cd581fd472286a3df4a28fd1 100644
--- a/Numeric/miniBasis.cpp
+++ b/Numeric/miniBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "miniBasis.h"
 #include "BasisFactory.h"
diff --git a/Numeric/miniBasis.h b/Numeric/miniBasis.h
index ce42bdd162c08776ae326d77bd7637062be81851..563bc4064fa28642ad8e8bb9a04c095b07f8daac 100644
--- a/Numeric/miniBasis.h
+++ b/Numeric/miniBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MINI_BASIS_H_
 #define _MINI_BASIS_H_
diff --git a/Numeric/nodalBasis.cpp b/Numeric/nodalBasis.cpp
index 9b96eccb48c3f656b49380484dd693ea7f993495..b93f52a0c82029ebdfa5b09e892f617f66ce5670 100644
--- a/Numeric/nodalBasis.cpp
+++ b/Numeric/nodalBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <limits>
 #include <cmath>
diff --git a/Numeric/nodalBasis.h b/Numeric/nodalBasis.h
index 5974f4a253014ce6091663dc6ef2c3040582c8c2..ec61eff8cbd70f5c4b76257298543f4b0dbbe616 100644
--- a/Numeric/nodalBasis.h
+++ b/Numeric/nodalBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef NODALBASIS_H
 #define NODALBASIS_H
diff --git a/Numeric/pointsGenerators.cpp b/Numeric/pointsGenerators.cpp
index a5f7342d1efc8c15382ad305d9043f487d548ac6..0d9b50d31073311854f82aeb4b1357b1c856f787 100644
--- a/Numeric/pointsGenerators.cpp
+++ b/Numeric/pointsGenerators.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "pointsGenerators.h"
 #include "GmshDefines.h"
diff --git a/Numeric/pointsGenerators.h b/Numeric/pointsGenerators.h
index dd98051400187200a21195c68b5c3ab78a81269b..e5b65d9758e5fa215447efc4bed2f4ec096db962 100644
--- a/Numeric/pointsGenerators.h
+++ b/Numeric/pointsGenerators.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef POINTSGENERATORS_H
 #define POINTSGENERATORS_H
diff --git a/Numeric/polynomialBasis.cpp b/Numeric/polynomialBasis.cpp
index 9339243966817eb138a13655127ce4cd2ff66647..3c3596b186bb35121ff7586a86a05a89296d61e3 100644
--- a/Numeric/polynomialBasis.cpp
+++ b/Numeric/polynomialBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Koen Hillewaert
diff --git a/Numeric/polynomialBasis.h b/Numeric/polynomialBasis.h
index 00149b1799fe8aef117542efa1586f72469b7fdc..0e03da27ff61649d95ae9d1b8c4fe01916eea698 100644
--- a/Numeric/polynomialBasis.h
+++ b/Numeric/polynomialBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _POLYNOMIAL_BASIS_H_
 #define _POLYNOMIAL_BASIS_H_
diff --git a/Numeric/pyramidalBasis.cpp b/Numeric/pyramidalBasis.cpp
index d712e1d08c35a6e438bf2e5dd89718f0cc2f2f66..aed648cb9941818647f9d81131e82f92004aa317 100644
--- a/Numeric/pyramidalBasis.cpp
+++ b/Numeric/pyramidalBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <cmath>
 #include <algorithm>
diff --git a/Numeric/pyramidalBasis.h b/Numeric/pyramidalBasis.h
index 483bb47b79d3e9d50ff159d7c77f6372017ca1aa..abe8d0d45f1d0abb272f8e90d681c0176a2c44e2 100644
--- a/Numeric/pyramidalBasis.h
+++ b/Numeric/pyramidalBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef PYRAMIDALBASIS_H
 #define PYRAMIDALBASIS_H
diff --git a/Numeric/robustPredicates.h b/Numeric/robustPredicates.h
index 22504338c7262baf986ea85da4e79f6729633b70..791d540f935da6ef609a047bf862f28e01bc3d1b 100644
--- a/Numeric/robustPredicates.h
+++ b/Numeric/robustPredicates.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ROBUST_PREDICATES_H_
 #define _ROBUST_PREDICATES_H_
diff --git a/Numeric/simpleFunction.h b/Numeric/simpleFunction.h
index fe21918282f45df321f151317be23584e8750e34..19f83cb1c03d5ba7f9b988ed25b95254f8301dbb 100644
--- a/Numeric/simpleFunction.h
+++ b/Numeric/simpleFunction.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SIMPLE_FUNCTION_H_
 #define _SIMPLE_FUNCTION_H_
diff --git a/Numeric/simpleFunctionPython.h b/Numeric/simpleFunctionPython.h
index c89b481093ebf0ecef344ed702e2a5d93e23d835..a2ecbaddf3627ca961ff99fd02efd517f79b6897 100644
--- a/Numeric/simpleFunctionPython.h
+++ b/Numeric/simpleFunctionPython.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SIMPLE_FUNCTION_PYTHON_H_
 #define _SIMPLE_FUNCTION_PYTHON_H_
diff --git a/Parser/CMakeLists.txt b/Parser/CMakeLists.txt
index 58fac8e8982ebd7a4fe235e2deb3f33791bb6fd2..b5f956da8f738431cc4e657435b596b63068c205 100644
--- a/Parser/CMakeLists.txt
+++ b/Parser/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Gmsh.tab.cpp
diff --git a/Parser/FunctionManager.cpp b/Parser/FunctionManager.cpp
index 93d546b60d927b93854d32b42bcc24ccbe3f4b65..8a71b78342cf27a29f562a837455a04fb33abaff 100644
--- a/Parser/FunctionManager.cpp
+++ b/Parser/FunctionManager.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <map>
 #include <stack>
diff --git a/Parser/FunctionManager.h b/Parser/FunctionManager.h
index 19cb68be2341123c4fe60308813650c38d341cd2..969e9d7889a7fa67176893414002a0dffc498ddf 100644
--- a/Parser/FunctionManager.h
+++ b/Parser/FunctionManager.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FUNCTION_MANAGER_H_
 #define _FUNCTION_MANAGER_H_
diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l
index 725db43c28876dce29b0669f92ecdc1e5efbf15a..a210b7464d5a180dea162e9ea4e41624fe04be90 100644
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -2,7 +2,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 1b9f47b661ce04e0b15d7cdabd28fa683cb32816..83c73067e0952a92d10bb75f2ee2f394e9055f2c 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -75,7 +75,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <map>
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index c6077812709262e1489e96155858197620c50db4..aba5085548e4e9c8503d265f586a868025e872ed 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -2,7 +2,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <map>
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 8466f6be6ebc3c9a53c7bd43594dde2428695442..43ac601c301569d84419e5495a85eb5eef982d8e 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -1096,7 +1096,7 @@ char *gmsh_yytext;
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Parser/Parser.h b/Parser/Parser.h
index 37ff379e85721eb6a5c9b40cfc53c98b3965b9c5..c73afc0127ae239640e75b194677bb0ff7f69f87 100644
--- a/Parser/Parser.h
+++ b/Parser/Parser.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARSER_H_
 #define _PARSER_H_
diff --git a/Plugin/AnalyseCurvedMesh.cpp b/Plugin/AnalyseCurvedMesh.cpp
index 571f8fc58a90ddcc47af535e81c3c6a0e8e6cd74..3b3cc3c1c8118938b4c87b4710ae187495955f43 100644
--- a/Plugin/AnalyseCurvedMesh.cpp
+++ b/Plugin/AnalyseCurvedMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "AnalyseCurvedMesh.h"
 #include "OS.h"
diff --git a/Plugin/AnalyseCurvedMesh.h b/Plugin/AnalyseCurvedMesh.h
index abbf102c7890b14edc764194103f9a80e358f9d2..85b403d5b2a806685be4d50c296a1b64edc07266 100644
--- a/Plugin/AnalyseCurvedMesh.h
+++ b/Plugin/AnalyseCurvedMesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ANALYSECURVEDMESH_H_
 #define _ANALYSECURVEDMESH_H_
diff --git a/Plugin/Annotate.cpp b/Plugin/Annotate.cpp
index 127f8db4795dc577e3a64cb68838064fc4f56764..8d732101be1b00b13c99ed7830fc80f3ccbc3d1e 100644
--- a/Plugin/Annotate.cpp
+++ b/Plugin/Annotate.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include "GmshConfig.h"
diff --git a/Plugin/Annotate.h b/Plugin/Annotate.h
index a72a2e63b997395f7d3ac1c52b8fd90515dd1d41..853b19c85c2c7d27b7f365927663d74978012ef2 100644
--- a/Plugin/Annotate.h
+++ b/Plugin/Annotate.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ANNOTATE_H_
 #define _ANNOTATE_H_
diff --git a/Plugin/Bubbles.cpp b/Plugin/Bubbles.cpp
index 058bb8b51305fb4f4e9d83d2ebdcfaa54118b562..905f8235a672719a33465dbcbc858aa9d10e3cf4 100644
--- a/Plugin/Bubbles.cpp
+++ b/Plugin/Bubbles.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Plugin/Bubbles.h b/Plugin/Bubbles.h
index b1d96cf32ac253254da59de5e62b2e285eb40fcb..42b22f5d6531bd044cf856bd179119dda0b2a28d 100644
--- a/Plugin/Bubbles.h
+++ b/Plugin/Bubbles.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BUBBLES_H_
 #define _BUBBLES_H_
diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt
index dd19613fd0c050d710e068abb182e3b1ece36eb1..5c98130f5b0a54ca5dbe0116291415abdf42e6f0 100644
--- a/Plugin/CMakeLists.txt
+++ b/Plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Plugin.cpp PluginManager.cpp
diff --git a/Plugin/CVTRemesh.cpp b/Plugin/CVTRemesh.cpp
index e09877c565f886fee3fda80a8c93934d4ec4daef..42b3f3b67e8527eb93ee2d996eda6b99274134fc 100644
--- a/Plugin/CVTRemesh.cpp
+++ b/Plugin/CVTRemesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Plugin/CVTRemesh.h b/Plugin/CVTRemesh.h
index 41bfd1894cc1c6e0f0e65c8531995a30329b391b..c3f7540d4e49263797449b58ac7d32954e8a2a8d 100644
--- a/Plugin/CVTRemesh.h
+++ b/Plugin/CVTRemesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CVT_REMESH_H_
 #define _CVT_REMESH_H_
diff --git a/Plugin/Crack.cpp b/Plugin/Crack.cpp
index 01f36250a624fa7dd1868d2c63f6d618208d814f..68b8dec25ba34d01f50b73f0d1379f91a1db908e 100644
--- a/Plugin/Crack.cpp
+++ b/Plugin/Crack.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Crack.h"
 #include "GModel.h"
diff --git a/Plugin/Crack.h b/Plugin/Crack.h
index e38784035a1e902336d38be5de8138875a9e7abd..73c8ed7e02595a575516b50b6851bf53ec2004ee 100644
--- a/Plugin/Crack.h
+++ b/Plugin/Crack.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CRACK_H_
 #define _CRACK_H_
diff --git a/Plugin/Curl.cpp b/Plugin/Curl.cpp
index 0337cc7ad5d14ed0d5c43f18fb8ddc9c4d05913b..3fa8464e97c2478bba67d08698abdf4f8d4a9fce 100644
--- a/Plugin/Curl.cpp
+++ b/Plugin/Curl.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Curl.h"
 #include "shapeFunctions.h"
diff --git a/Plugin/Curl.h b/Plugin/Curl.h
index d1af7f4851f54a44c2fd4fd5432889d7aea21ea7..910a437019ae40c00a7e8136dfc2152acdd69b5e 100644
--- a/Plugin/Curl.h
+++ b/Plugin/Curl.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CURL_H_
 #define _CURL_H_
diff --git a/Plugin/CurvedBndDist.cpp b/Plugin/CurvedBndDist.cpp
index 10d9c5de973f8e5b9405eafe25029d3eb3430be3..7ffe58aab1029da37d51d21a2d2f121ef3f6b0d0 100644
--- a/Plugin/CurvedBndDist.cpp
+++ b/Plugin/CurvedBndDist.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Gmsh.h"
 #include "GmshConfig.h"
diff --git a/Plugin/CurvedBndDist.h b/Plugin/CurvedBndDist.h
index 904e5ba391a3d5ab65d61546d305a6a9822b6f61..4d1306117087413ac43046abb7ed2508247fa131 100644
--- a/Plugin/CurvedBndDist.h
+++ b/Plugin/CurvedBndDist.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CURVEDBNDDIST_H_
 #define _CURVEDBNDDIST_H_
diff --git a/Plugin/CutBox.cpp b/Plugin/CutBox.cpp
index b66e4e05775f2f90378c4bc346264cac063b10bc..850b407a071f112de47cf6db6596a8d751e355f6 100644
--- a/Plugin/CutBox.cpp
+++ b/Plugin/CutBox.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "OctreePost.h"
diff --git a/Plugin/CutBox.h b/Plugin/CutBox.h
index d30916a273e566d8a3bd82b07a23e653a4c671db..bbefe30290ea8b1d73310b9e07f6e7d0fdfff9dc 100644
--- a/Plugin/CutBox.h
+++ b/Plugin/CutBox.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_BOX_H_
 #define _CUT_BOX_H_
diff --git a/Plugin/CutGrid.cpp b/Plugin/CutGrid.cpp
index 512c797a0f8bc340177d7463711a50bab8f28d87..88475df7e4e600062ed4233c2482d68e8f0ce50c 100644
--- a/Plugin/CutGrid.cpp
+++ b/Plugin/CutGrid.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "OctreePost.h"
diff --git a/Plugin/CutGrid.h b/Plugin/CutGrid.h
index f1fe120dad1ac74fa3eddb757ae1177927c11728..b7cd56387b644bc70a5420b07bbd5fc202b73d10 100644
--- a/Plugin/CutGrid.h
+++ b/Plugin/CutGrid.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_GRID_H_
 #define _CUT_GRID_H_
diff --git a/Plugin/CutMesh.cpp b/Plugin/CutMesh.cpp
index f96eba77cd77368ebc019a67a61173d27e80deba..66cdf4b4cb6db62e234ff2bf2fc358482bacc296 100644
--- a/Plugin/CutMesh.cpp
+++ b/Plugin/CutMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "CutMesh.h"
 #include "GModel.h"
diff --git a/Plugin/CutMesh.h b/Plugin/CutMesh.h
index 5bbc488539ee282b2204f34b0833084dea3179f0..b4822827c6d6a0927f743de79424762bbcfb64a4 100644
--- a/Plugin/CutMesh.h
+++ b/Plugin/CutMesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUTMESH_H_
 #define _CUTMESH_H_
diff --git a/Plugin/CutParametric.cpp b/Plugin/CutParametric.cpp
index 09ca7b565d6afdb464e3c59082f62d015fa64e6d..3678ca4793d33f2196773438fe982cd1daccddb2 100644
--- a/Plugin/CutParametric.cpp
+++ b/Plugin/CutParametric.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GmshConfig.h"
diff --git a/Plugin/CutParametric.h b/Plugin/CutParametric.h
index 780303b2ae25d0fae0e2d8ca54052eab9a7bf522..73b7aedb160b04ba46227ac10dfab6b71bc0a640 100644
--- a/Plugin/CutParametric.h
+++ b/Plugin/CutParametric.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_PARAMETRIC_H_
 #define _CUT_PARAMETRIC_H_
diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp
index 9bf63af5b59cd57bef5d8643dc820b98f9a71643..e17a4288fa8073229f90176aa48050476f4d5cef 100644
--- a/Plugin/CutPlane.cpp
+++ b/Plugin/CutPlane.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "CutPlane.h"
diff --git a/Plugin/CutPlane.h b/Plugin/CutPlane.h
index baa5961133ade282b87f3647ecde17332da86f1f..bec9eef4684c926285ec5e04f9df91a06ff3c480 100644
--- a/Plugin/CutPlane.h
+++ b/Plugin/CutPlane.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_PLANE_H_
 #define _CUT_PLANE_H_
diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp
index 12496af8bb9a43ba1a824b5024abcd89665815c2..14a33786fa78b65f67e5e26ea0bc8b699b9c5ea3 100644
--- a/Plugin/CutSphere.cpp
+++ b/Plugin/CutSphere.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "GmshConfig.h"
diff --git a/Plugin/CutSphere.h b/Plugin/CutSphere.h
index 0740f1418cbe0909250ff88a647962047900f381..74ef8aa259f9724e597ec5ba7f2d4bca2b28f3fb 100644
--- a/Plugin/CutSphere.h
+++ b/Plugin/CutSphere.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_SPHERE_H_
 #define _CUT_SPHERE_H_
diff --git a/Plugin/DiscretizationError.cpp b/Plugin/DiscretizationError.cpp
index 31b2de9f8d4f78d970971adf40ec9d44f594f2f6..e791b665a5852d37e33dfe40052595e32578b020 100644
--- a/Plugin/DiscretizationError.cpp
+++ b/Plugin/DiscretizationError.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "DiscretizationError.h"
 #include "Numeric.h"
diff --git a/Plugin/DiscretizationError.h b/Plugin/DiscretizationError.h
index bc1928bb04a65232803096bae56498a7f9b499b8..d10a8afc2116dba2110a402d7d7598ea7c32dfed 100644
--- a/Plugin/DiscretizationError.h
+++ b/Plugin/DiscretizationError.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETIZATION_ERROR_H_
 #define _DISCRETIZATION_ERROR_H_
diff --git a/Plugin/Distance.cpp b/Plugin/Distance.cpp
index 2f287aed279ff8be33a70903adabb39b384d0832..3c72320ea79d49526282ca5931c549c665a61854 100644
--- a/Plugin/Distance.cpp
+++ b/Plugin/Distance.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Plugin/Distance.h b/Plugin/Distance.h
index d8147c80f9354b86fc6456a665648067092d1c03..7cb83a0be2de306fff0cce0ac4f0ef6fade199ff 100644
--- a/Plugin/Distance.h
+++ b/Plugin/Distance.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISTANCE_H_
 #define _DISTANCE_H_
diff --git a/Plugin/Divergence.cpp b/Plugin/Divergence.cpp
index 947b6c35132e509690a45c2bbb2bab5b6f6bfd96..5c69d580f52586c7121149e8752c58fce5e5b641 100644
--- a/Plugin/Divergence.cpp
+++ b/Plugin/Divergence.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Divergence.h"
 #include "shapeFunctions.h"
diff --git a/Plugin/Divergence.h b/Plugin/Divergence.h
index 65407eb63a89b8cde3b763d76a51a619df74352a..eeb9f20263b18afcc3c822f62a5c6d18baf6ba4d 100644
--- a/Plugin/Divergence.h
+++ b/Plugin/Divergence.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DIVERGENCE_H_
 #define _DIVERGENCE_H_
diff --git a/Plugin/DuplicateBoundaries.cpp b/Plugin/DuplicateBoundaries.cpp
index db6b15c2aa3a6c7e7a70dbc53f1668429e201b3d..92a91a763ca78522682b040f68284b34c5a236a3 100644
--- a/Plugin/DuplicateBoundaries.cpp
+++ b/Plugin/DuplicateBoundaries.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "DuplicateBoundaries.h"
 #include "GModel.h"
diff --git a/Plugin/DuplicateBoundaries.h b/Plugin/DuplicateBoundaries.h
index ac4dbc67abf6f6021025e48a3cc6dedbe0e6559c..6fa59e7ac169714d311cadb2bacb8781356691f4 100644
--- a/Plugin/DuplicateBoundaries.h
+++ b/Plugin/DuplicateBoundaries.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DUPLICATEBOUNDARIES_H_
 #define _DUPLICATEBOUNDARIES_H_
diff --git a/Plugin/Eigenvalues.cpp b/Plugin/Eigenvalues.cpp
index 147aad10ecf6b626799b8dcfb03d0c5cc6cdfdab..d1c8a834d738d4f384d52c769e7a50f9aafa71ca 100644
--- a/Plugin/Eigenvalues.cpp
+++ b/Plugin/Eigenvalues.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Eigenvalues.h"
 #include "Numeric.h"
diff --git a/Plugin/Eigenvalues.h b/Plugin/Eigenvalues.h
index a815f343b1f74d9db9da330b3866a35268898700..f06b8bdd8d9656ae2f6b0375c9f1d948fa9a670e 100644
--- a/Plugin/Eigenvalues.h
+++ b/Plugin/Eigenvalues.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EIGENVALUES_H_
 #define _EIGENVALUES_H_
diff --git a/Plugin/Eigenvectors.cpp b/Plugin/Eigenvectors.cpp
index 62c003ecf8e2a7f87dbce32c0f28ed51fd981ae1..4cf9764bebd1f2b523d1fd99ec1fa0a490ef6998 100644
--- a/Plugin/Eigenvectors.cpp
+++ b/Plugin/Eigenvectors.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Eigenvectors.h"
 #include "Numeric.h"
diff --git a/Plugin/Eigenvectors.h b/Plugin/Eigenvectors.h
index 25924d637c01c09bb7814b402fa01069573961fc..213828c7577d4e1c581a8d82629bea333bcc3f02 100644
--- a/Plugin/Eigenvectors.h
+++ b/Plugin/Eigenvectors.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EIGENVECTORS_H_
 #define _EIGENVECTORS_H_
diff --git a/Plugin/ExtractEdges.cpp b/Plugin/ExtractEdges.cpp
index fc663af1b6d745c03cb42fe81795b3a1ebd58c94..1ee793030236215abba777c43456b0cd7b43edd1 100644
--- a/Plugin/ExtractEdges.cpp
+++ b/Plugin/ExtractEdges.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GModel.h"
diff --git a/Plugin/ExtractEdges.h b/Plugin/ExtractEdges.h
index c474b004528ddac7ca3ab78853406532513e7407..7e022e35b8224f9dcbe33894a44fc4d0c79089bf 100644
--- a/Plugin/ExtractEdges.h
+++ b/Plugin/ExtractEdges.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EXTRACT_EDGES_H_
 #define _EXTRACT_EDGES_H_
diff --git a/Plugin/ExtractElements.cpp b/Plugin/ExtractElements.cpp
index 4075554caafa3f28b1edcbeb4941c6e8ad08617b..964beebf0e3adffb1ba584a45d3089165bb55589 100644
--- a/Plugin/ExtractElements.cpp
+++ b/Plugin/ExtractElements.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "ExtractElements.h"
 #include "Numeric.h"
diff --git a/Plugin/ExtractElements.h b/Plugin/ExtractElements.h
index 4e123b69b917247e639c135d517dd16cf292c257..ea36a93a745392fab9ee5f76f80d30392998496e 100644
--- a/Plugin/ExtractElements.h
+++ b/Plugin/ExtractElements.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EXTRACT_ELEMENTS_H_
 #define _EXTRACT_ELEMENTS_H_
diff --git a/Plugin/FaultZone.cpp b/Plugin/FaultZone.cpp
index 3d1177358c5e54d8ca1a4baa8116b4a8bd470007..08043fbd2a3d35dfb85449243fd87612b93395c6 100644
--- a/Plugin/FaultZone.cpp
+++ b/Plugin/FaultZone.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <assert.h>
 #include <sstream>
diff --git a/Plugin/FaultZone.h b/Plugin/FaultZone.h
index 61b68a1f801f0792e460f836932539c70c53484a..c5ef6d9b7c0e10c0d6ed76f3c0dc3659cf5034fc 100644
--- a/Plugin/FaultZone.h
+++ b/Plugin/FaultZone.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_FAULTZONE_H_
 #define _MESH_FAULTZONE_H_
diff --git a/Plugin/FieldFromAmplitudePhase.cpp b/Plugin/FieldFromAmplitudePhase.cpp
index 12c228dc6dd170f18c9eddd6227ff8f8738ae76a..e7845922272526f724dc0e2b81ba93810eb114d7 100644
--- a/Plugin/FieldFromAmplitudePhase.cpp
+++ b/Plugin/FieldFromAmplitudePhase.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Plugin/FieldFromAmplitudePhase.h b/Plugin/FieldFromAmplitudePhase.h
index ca908782caeeb7f886e5f71e0748f01d871c3cb5..c64fcecd5b874c1ef78f415a93368b316be32d0b 100644
--- a/Plugin/FieldFromAmplitudePhase.h
+++ b/Plugin/FieldFromAmplitudePhase.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIELD_FROM_AMPLITUDE_PHASE_H_
 #define _FIELD_FROM_AMPLITUDE_PHASE_H_
diff --git a/Plugin/Gradient.cpp b/Plugin/Gradient.cpp
index af7fd40a915b6ccd7d277e383af89198740a9294..e6a7fd4743c505fa03fa10867027e535632ced69 100644
--- a/Plugin/Gradient.cpp
+++ b/Plugin/Gradient.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Gradient.h"
 #include "shapeFunctions.h"
diff --git a/Plugin/Gradient.h b/Plugin/Gradient.h
index 29633007b6e8f8255dadefaba4e77758f666c863..fb9a0671beea7f8e23c83d12011c6d88efec8520 100644
--- a/Plugin/Gradient.h
+++ b/Plugin/Gradient.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GRADIENT_H_
 #define _GRADIENT_H_
diff --git a/Plugin/HarmonicToTime.cpp b/Plugin/HarmonicToTime.cpp
index 2ef30ab049b71349a28c1f8a40f7796db9767c4f..95ce5e43a55efd01db911d6f5a3a5a103b4ee238 100644
--- a/Plugin/HarmonicToTime.cpp
+++ b/Plugin/HarmonicToTime.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "HarmonicToTime.h"
 #include "GmshDefines.h"
diff --git a/Plugin/HarmonicToTime.h b/Plugin/HarmonicToTime.h
index 8ffc02b8b96605b82f12512d61c0820517d025f6..61f19805e667a51084487f543d3f73882612034e 100644
--- a/Plugin/HarmonicToTime.h
+++ b/Plugin/HarmonicToTime.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HARMONIC_TO_TIME_H_
 #define _HARMONIC_TO_TIME_H_
diff --git a/Plugin/HomologyComputation.cpp b/Plugin/HomologyComputation.cpp
index 948d17ffeac102f0d0d27d209ff5f95858d7272c..06b699ebcdbdb730e57e9f3b776b39c874b46292 100644
--- a/Plugin/HomologyComputation.cpp
+++ b/Plugin/HomologyComputation.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Plugin/HomologyComputation.h b/Plugin/HomologyComputation.h
index adbadb2776cc8ad673a2f6396a6b5821974c107e..06c043a72e96eadb72752a1b05c34b04f5ba8f85 100644
--- a/Plugin/HomologyComputation.h
+++ b/Plugin/HomologyComputation.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Plugin/HomologyPostProcessing.cpp b/Plugin/HomologyPostProcessing.cpp
index 7e482eb9171880c7f326ce22fa51e46ab31faf45..6a583783cb331fee7abdbfc74962cb3b4b04f4c2 100644
--- a/Plugin/HomologyPostProcessing.cpp
+++ b/Plugin/HomologyPostProcessing.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Plugin/HomologyPostProcessing.h b/Plugin/HomologyPostProcessing.h
index 97eb012345dc1182628325b393a45b3a06e53e92..bed4b7587a5e12406db3dc982c0b00a4008bbe94 100644
--- a/Plugin/HomologyPostProcessing.h
+++ b/Plugin/HomologyPostProcessing.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Plugin/Integrate.cpp b/Plugin/Integrate.cpp
index b3d3326d18029b86e77580715ec22080a3270cc4..b0dff3a82b3cdaa9d355364443a66d38ab0694a3 100644
--- a/Plugin/Integrate.cpp
+++ b/Plugin/Integrate.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Integrate.h"
 #include "shapeFunctions.h"
diff --git a/Plugin/Integrate.h b/Plugin/Integrate.h
index b0466c763247c7394acba00bfe07fcef3a2f7f4a..f7ddf46ed40b46423b3adac976f94d0cf9a8abee 100644
--- a/Plugin/Integrate.h
+++ b/Plugin/Integrate.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INTEGRATE_H_
 #define _INTEGRATE_H_
diff --git a/Plugin/Isosurface.cpp b/Plugin/Isosurface.cpp
index cecb8fc3c41af4d4fdff6df2d1e80301bdb6efc3..f38bb5fe71fd4f4da9a073cbca250d4926c27c9a 100644
--- a/Plugin/Isosurface.cpp
+++ b/Plugin/Isosurface.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Isosurface.h"
 #include "Context.h"
diff --git a/Plugin/Isosurface.h b/Plugin/Isosurface.h
index f2363c188c83ade28796d755693c9e2e3d77278b..1ba8c87f0469820158975885db1474a912e3d81a 100644
--- a/Plugin/Isosurface.h
+++ b/Plugin/Isosurface.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ISOSURFACE_H_
 #define _ISOSURFACE_H_
diff --git a/Plugin/Lambda2.cpp b/Plugin/Lambda2.cpp
index baf771a7590952897696355e3455172185483da7..a14a0cfdad27fb40bad1dd770c5f8d43a3f56678 100644
--- a/Plugin/Lambda2.cpp
+++ b/Plugin/Lambda2.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Lambda2.h"
 #include "Numeric.h"
diff --git a/Plugin/Lambda2.h b/Plugin/Lambda2.h
index 6d7ecb142f6b22340aeb663a6d727fe07ee1aed9..eced4abf52dd6dc785b9060b1e05459663b57582 100644
--- a/Plugin/Lambda2.h
+++ b/Plugin/Lambda2.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LAMBDA2_H_
 #define _LAMBDA2_H_
diff --git a/Plugin/Levelset.cpp b/Plugin/Levelset.cpp
index c02f5e4d565cf1cd862febb7efeea093c5670d56..49d35d3a37543fba083999c68a9a9176d0f7420e 100644
--- a/Plugin/Levelset.cpp
+++ b/Plugin/Levelset.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Levelset.h"
 #include "MakeSimplex.h"
diff --git a/Plugin/Levelset.h b/Plugin/Levelset.h
index d9c3671527545132f8f4e3439618c2ee4fb801ef..a8f3bb847b600e174ced848e3f6c9560c500f2bd 100644
--- a/Plugin/Levelset.h
+++ b/Plugin/Levelset.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LEVELSET_H_
 #define _LEVELSET_H_
diff --git a/Plugin/LongitudeLatitude.cpp b/Plugin/LongitudeLatitude.cpp
index cfa26a06c22caed1d124abc44dad9eb7a2f92e52..6d55e98103c3f0f65ca1691fefa9db84c98e61b3 100644
--- a/Plugin/LongitudeLatitude.cpp
+++ b/Plugin/LongitudeLatitude.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "LongitudeLatitude.h"
diff --git a/Plugin/LongitudeLatitude.h b/Plugin/LongitudeLatitude.h
index 62470d562e9f84ec41c20c6d632371579a9f955f..247ba19d303c2a72021d09c775188c9da74464a9 100644
--- a/Plugin/LongitudeLatitude.h
+++ b/Plugin/LongitudeLatitude.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LONGITUDELATITUDE_H_
 #define _LONGITUDELATITUDE_H_
diff --git a/Plugin/MakeSimplex.cpp b/Plugin/MakeSimplex.cpp
index 6f0acfec79233598b9b62369706dc144811eed37..2b14a3eb05c75226774044b09e3463dea90cd05a 100644
--- a/Plugin/MakeSimplex.cpp
+++ b/Plugin/MakeSimplex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MakeSimplex.h"
 
diff --git a/Plugin/MakeSimplex.h b/Plugin/MakeSimplex.h
index 713dfa6791c68694b58635f09e6f9807d5c8f396..c20ad79c46c8ec701c1095326f9507f7136304ca 100644
--- a/Plugin/MakeSimplex.h
+++ b/Plugin/MakeSimplex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MAKE_SIMPLEX_H_
 #define _MAKE_SIMPLEX_H_
diff --git a/Plugin/MathEval.cpp b/Plugin/MathEval.cpp
index 53590420ab3a017d8d6b6068e19de440fb6e792a..d75d300c5b00d3eea7f236d760900ac0effec06b 100644
--- a/Plugin/MathEval.cpp
+++ b/Plugin/MathEval.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshDefines.h"
diff --git a/Plugin/MathEval.h b/Plugin/MathEval.h
index 502eb0a6ace46ff86fff4bd26f1f5a9bfe1290b3..23b9ece1b1ac3223abaacd64f83918c80f75668d 100644
--- a/Plugin/MathEval.h
+++ b/Plugin/MathEval.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MATH_EVAL_H_
 #define _MATH_EVAL_H_
diff --git a/Plugin/MeshSubEntities.cpp b/Plugin/MeshSubEntities.cpp
index fd4ce5b2ff59ebcbd9669ddec2a7a24fc8f39be0..45a56f1dee27993dd7b2e4283adbf2fe4dce6993 100644
--- a/Plugin/MeshSubEntities.cpp
+++ b/Plugin/MeshSubEntities.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MeshSubEntities.h"
 #include "GModel.h"
diff --git a/Plugin/MeshSubEntities.h b/Plugin/MeshSubEntities.h
index 024a080049a923096bc0c404242b288ba75d2fd4..e9f1e02cd395e1b52cdfdf265c4f5b2e18628823 100644
--- a/Plugin/MeshSubEntities.h
+++ b/Plugin/MeshSubEntities.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_ENTITIES_H_
 #define _MESH_ENTITIES_H_
diff --git a/Plugin/MinMax.cpp b/Plugin/MinMax.cpp
index 84bd609ad6c69a0c591d125abb8b731771aa29ac..7694e55997c14866773412b88399b4535e0d077a 100644
--- a/Plugin/MinMax.cpp
+++ b/Plugin/MinMax.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MinMax.h"
 #include "PViewOptions.h"
diff --git a/Plugin/MinMax.h b/Plugin/MinMax.h
index dd072e5d3b6a029bbc1e3065dbe50d1e54fcf788..06032f407bf5bfeb8e80a1c57d92a32629b3737b 100644
--- a/Plugin/MinMax.h
+++ b/Plugin/MinMax.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MIN_MAX_H_
 #define _MIN_MAX_H_
diff --git a/Plugin/ModifyComponents.cpp b/Plugin/ModifyComponents.cpp
index 78af61ea28d8418a78d000b82e09ed156fa0198a..6247ec8cbdb57f7a8c234975bf941f1bc3d01f21 100644
--- a/Plugin/ModifyComponents.cpp
+++ b/Plugin/ModifyComponents.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include <algorithm>
diff --git a/Plugin/ModifyComponents.h b/Plugin/ModifyComponents.h
index b5394d8d9edf86f287efb2cd30e4b827c34a8019..597bc6b5aae75dec54e25f7a7ab44f8f065d64bd 100644
--- a/Plugin/ModifyComponents.h
+++ b/Plugin/ModifyComponents.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MODIFY_COMPONENT_H_
 #define _MODIFY_COMPONENT_H_
diff --git a/Plugin/ModulusPhase.cpp b/Plugin/ModulusPhase.cpp
index 94ed51f7f9a76e15ffaf73cf0b5fd0bd9cf680d7..5a465db2a305fa1cc30ff680d34410774ce1360d 100644
--- a/Plugin/ModulusPhase.cpp
+++ b/Plugin/ModulusPhase.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "ModulusPhase.h"
 
diff --git a/Plugin/ModulusPhase.h b/Plugin/ModulusPhase.h
index ecdfb609556e215feeec0adef47a48aa13e801cd..7d5650d767ffd42e6a7c5d460c5c4353538e759a 100644
--- a/Plugin/ModulusPhase.h
+++ b/Plugin/ModulusPhase.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MODULUS_PHASE_H_
 #define _MODULUS_PHASE_H_
diff --git a/Plugin/NearToFarField.cpp b/Plugin/NearToFarField.cpp
index 5056a237cfa7d49821ff92c2a9e8d34dc8a50095..3910cbecd98aca8491314000498fffe5dfd60126 100644
--- a/Plugin/NearToFarField.cpp
+++ b/Plugin/NearToFarField.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Ruth Sabariego
diff --git a/Plugin/NearToFarField.h b/Plugin/NearToFarField.h
index ae0bebbd684f5dc0d397ccafefdd067c7316dd22..f4264643e62c8cb651feab97afec96848efa74a4 100644
--- a/Plugin/NearToFarField.h
+++ b/Plugin/NearToFarField.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _NEARTOFARFIELD_H_
 #define _NEARTOFARFIELD_H_
diff --git a/Plugin/NearestNeighbor.cpp b/Plugin/NearestNeighbor.cpp
index e571dad25804a0cfe15e9887794f8ca0bfe869e6..0e327eb85557b91e03c5ce9147b2f2e62c1fecc4 100644
--- a/Plugin/NearestNeighbor.cpp
+++ b/Plugin/NearestNeighbor.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "NearestNeighbor.h"
diff --git a/Plugin/NearestNeighbor.h b/Plugin/NearestNeighbor.h
index a6892b70cba635e1c4befe9c14a48ee6a43e9eef..3166237d1b8a95f6585b389e342a0d9cbd362315 100644
--- a/Plugin/NearestNeighbor.h
+++ b/Plugin/NearestNeighbor.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _NEAREST_NEIGHBOR_H_
 #define _NEAREST_NEIGHBOR_H_
diff --git a/Plugin/NewView.cpp b/Plugin/NewView.cpp
index f51fb53a12c4f49077f130ed0db226af773be039..976cbcf34bc7de5b07688b23efb163832f406340 100644
--- a/Plugin/NewView.cpp
+++ b/Plugin/NewView.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Ruth Sabariego  & Francois Henrotte
diff --git a/Plugin/NewView.h b/Plugin/NewView.h
index 24d7ae63215033967333a7294def677a5e195bfe..de0d77b7702a8a7b3173115ca25d89f9a72c40af 100644
--- a/Plugin/NewView.h
+++ b/Plugin/NewView.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _NEWVIEW_H_
 #define _NEWVIEW_H_
diff --git a/Plugin/Particles.cpp b/Plugin/Particles.cpp
index 6b233b6353a7f495fe5d82f87f07a023ee7274cf..913f957d715d211756fcf79e3c4e661b362544db 100644
--- a/Plugin/Particles.cpp
+++ b/Plugin/Particles.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GmshConfig.h"
diff --git a/Plugin/Particles.h b/Plugin/Particles.h
index 51d9f356d952d8aa9481f534f3d1e1f860b959de..22a3a839d881b591d173315b417a16e2ae7a0f6f 100644
--- a/Plugin/Particles.h
+++ b/Plugin/Particles.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTICLES_H_
 #define _PARTICLES_H_
diff --git a/Plugin/Plugin.cpp b/Plugin/Plugin.cpp
index 6f07b7ced33cc85c4ecf014e723e778bfbb0c122..c46ba2bda427f8b768ac84be848e3d7a51d28dc8 100644
--- a/Plugin/Plugin.cpp
+++ b/Plugin/Plugin.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <stdio.h>
diff --git a/Plugin/Plugin.h b/Plugin/Plugin.h
index 51d64c98618e869b0a8e1284b343a49dbafcfc06..75236534df819bdef1b3793657b30c6d619f5005 100644
--- a/Plugin/Plugin.h
+++ b/Plugin/Plugin.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PLUGIN_H_
 #define _PLUGIN_H_
diff --git a/Plugin/PluginManager.cpp b/Plugin/PluginManager.cpp
index 352a4a8c5535408fd68490d622930d20e083d6b5..30cd50bc046c652de83124fd53d17210d9451e79 100644
--- a/Plugin/PluginManager.cpp
+++ b/Plugin/PluginManager.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <map>
 #include <stdlib.h>
diff --git a/Plugin/PluginManager.h b/Plugin/PluginManager.h
index eb2069579530037740ca58e6a3759b65acc69cd8..40e83ef981c38a8a8b278c732bd290c54593c438 100644
--- a/Plugin/PluginManager.h
+++ b/Plugin/PluginManager.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PLUGIN_MANAGER_H_
 #define _PLUGIN_MANAGER_H_
diff --git a/Plugin/Probe.cpp b/Plugin/Probe.cpp
index 5d7359b6f1ae85b63df1413fcb8986ee2ba69015..ba1dc5084e0eecf35f4dcc1d70f150be776527db 100644
--- a/Plugin/Probe.cpp
+++ b/Plugin/Probe.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "Probe.h"
diff --git a/Plugin/Probe.h b/Plugin/Probe.h
index af86de9438b66acb990ccc8efcfbb962907f3516..81d71f3812ef65e04bcdabe8528b38b9dce90be5 100644
--- a/Plugin/Probe.h
+++ b/Plugin/Probe.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PROBE_H_
 #define _PROBE_H_
diff --git a/Plugin/Remove.cpp b/Plugin/Remove.cpp
index 3e7fe9ac13f046aa8c610f41f5e92975006a4aba..66ca38c0d207b3e55745441137c357781281b2d5 100644
--- a/Plugin/Remove.cpp
+++ b/Plugin/Remove.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Remove.h"
 
diff --git a/Plugin/Remove.h b/Plugin/Remove.h
index 9670a7247f9d6d60072f25add6aa1b4f898c7e2a..cd6bc65c4d79cd65a5d193bda4cf6bb4c858b01d 100644
--- a/Plugin/Remove.h
+++ b/Plugin/Remove.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _REMOVE_H_
 #define _REMOVE_H_
diff --git a/Plugin/Scal2Tens.cpp b/Plugin/Scal2Tens.cpp
index d1bd0a0371e3555f5002420e93a88823507066ae..fe5421693d176b7a99bab7f1130fb737810a0943 100644
--- a/Plugin/Scal2Tens.cpp
+++ b/Plugin/Scal2Tens.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Scal2Tens.h"
 #include "PViewOptions.h"
diff --git a/Plugin/Scal2Tens.h b/Plugin/Scal2Tens.h
index 144a74e434d0beee9d11eef2ab000f25d47ab57f..ed77d856fdc96b0ef3f5a22980600fea6fb6d6b0 100644
--- a/Plugin/Scal2Tens.h
+++ b/Plugin/Scal2Tens.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SCAL2TENS_H_
 #define _SCAL2TENS_H_
diff --git a/Plugin/Scal2Vec.cpp b/Plugin/Scal2Vec.cpp
index f42f5b1e08753f7a4177118eb35e2f51e63c2254..5a10a7beaa6272f451ae974aee8dea6f19bcdc75 100644
--- a/Plugin/Scal2Vec.cpp
+++ b/Plugin/Scal2Vec.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Scal2Vec.h"
 #include "PViewOptions.h"
diff --git a/Plugin/Scal2Vec.h b/Plugin/Scal2Vec.h
index ba13a8ef725c8e93f3d155a471570f7ce4ff034e..0196e1e1c530e32fa334584ca5fa5a496540ca6d 100644
--- a/Plugin/Scal2Vec.h
+++ b/Plugin/Scal2Vec.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SCAL2VEC_H_
 #define _SCAL2VEC_H_
diff --git a/Plugin/SimplePartition.cpp b/Plugin/SimplePartition.cpp
index df0dc252129be301829401fda790b0874f1272be..e319c9498d4c0fbbcefb98ab35c8cad3b7aa24c0 100644
--- a/Plugin/SimplePartition.cpp
+++ b/Plugin/SimplePartition.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "SimplePartition.h"
 #include "GModel.h"
diff --git a/Plugin/SimplePartition.h b/Plugin/SimplePartition.h
index ecb12fb8ed5f934f2daa3c23b1ab34c7b48b6d23..94816d0f260890d08fe3d3678ad57ed1a9f2b788 100644
--- a/Plugin/SimplePartition.h
+++ b/Plugin/SimplePartition.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SIMPLE_PARTITION_H_
 #define _SIMPLE_PARTITION_H_
diff --git a/Plugin/Skin.cpp b/Plugin/Skin.cpp
index ed22e7559bc0985022b108e2915fe72ed2429115..821d3e1ed0d9d9ac52fb26bb201906b4ad452e06 100644
--- a/Plugin/Skin.cpp
+++ b/Plugin/Skin.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "Skin.h"
diff --git a/Plugin/Skin.h b/Plugin/Skin.h
index d3e18f4a0db6b3b3e655867016bb5ac67630f77f..137092ca11c7e9c910549675d574d156dae194d5 100644
--- a/Plugin/Skin.h
+++ b/Plugin/Skin.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SKIN_H_
 #define _SKIN_H_
diff --git a/Plugin/Smooth.cpp b/Plugin/Smooth.cpp
index c1554c08fd88e0d023fd5c6326cdf58cb0846c45..785b0a700de583a697e6f4da13c682481eabbb36 100644
--- a/Plugin/Smooth.cpp
+++ b/Plugin/Smooth.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Smooth.h"
 
diff --git a/Plugin/Smooth.h b/Plugin/Smooth.h
index 592a48db6c8aea72a0a76076683f5fc4675732b7..b2b3ca93910232457e81c5c184ad54f72f2cd897 100644
--- a/Plugin/Smooth.h
+++ b/Plugin/Smooth.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SMOOTH_H_
 #define _SMOOTH_H_
diff --git a/Plugin/SphericalRaise.cpp b/Plugin/SphericalRaise.cpp
index 08530d290433ccb3e85c76e65ebc0e0a9e1a29b1..508233631bdd1213a924c45132950049f75a365b 100644
--- a/Plugin/SphericalRaise.cpp
+++ b/Plugin/SphericalRaise.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "SphericalRaise.h"
 #include "Numeric.h"
diff --git a/Plugin/SphericalRaise.h b/Plugin/SphericalRaise.h
index 4d0a7c8c3c3f94443b0adf0ce459cba8ce609ad9..e7c352210c42e65ab0e44d8e0aca4f48faebd992 100644
--- a/Plugin/SphericalRaise.h
+++ b/Plugin/SphericalRaise.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPHERICAL_RAISE_H_
 #define _SPHERICAL_RAISE_H_
diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp
index a02440d82ca524b5cfe90ca13eb6d3a4a4bbd0b4..8bc50bab4f8f9ee3665954be5e309ee7aa6e1114 100644
--- a/Plugin/StreamLines.cpp
+++ b/Plugin/StreamLines.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GmshConfig.h"
diff --git a/Plugin/StreamLines.h b/Plugin/StreamLines.h
index f518da5239a25e5c9cf7f1d89c0b368b666ef61d..c8ce908169d2db8316c47f09156240deb5dd5f89 100644
--- a/Plugin/StreamLines.h
+++ b/Plugin/StreamLines.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _STREAM_LINES_H_
 #define _STREAM_LINES_H_
diff --git a/Plugin/Tetrahedralize.cpp b/Plugin/Tetrahedralize.cpp
index 59b7e797020eec3bb1f1244ae7b9909074ed0aab..90e87d7f717e0e08df2af57b9e3e2a5498ef5e1c 100644
--- a/Plugin/Tetrahedralize.cpp
+++ b/Plugin/Tetrahedralize.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include "GmshConfig.h"
diff --git a/Plugin/Tetrahedralize.h b/Plugin/Tetrahedralize.h
index d59e201434669e766bf4d048421ed735cdff83c1..3e0b8ac05070366ba28a6b55fad83cffa888eb36 100644
--- a/Plugin/Tetrahedralize.h
+++ b/Plugin/Tetrahedralize.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TETRAHEDRALIZE_H_
 #define _TETRAHEDRALIZE_H_
diff --git a/Plugin/ThinLayerFixMesh.cpp b/Plugin/ThinLayerFixMesh.cpp
index 47eebc06210e3a54f41cf982323b647b8b764d66..166e47156cd9c401d01f3ed764887a24d59f1bac 100644
--- a/Plugin/ThinLayerFixMesh.cpp
+++ b/Plugin/ThinLayerFixMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Author: Nicolas Kowalski
 
diff --git a/Plugin/ThinLayerFixMesh.h b/Plugin/ThinLayerFixMesh.h
index 5575cb496a769e9b1e918ab16a73a6bb83b8b2f1..934f63638dc7b5a817bbb245e4349fb858b2e7b1 100644
--- a/Plugin/ThinLayerFixMesh.h
+++ b/Plugin/ThinLayerFixMesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Author: Nicolas Kowalski
 
diff --git a/Plugin/Transform.cpp b/Plugin/Transform.cpp
index 8a0afc99c81754c7bf462e51afefaf79916f7edb..46a37a40dc419e506f738af3ba09a25109b5d69e 100644
--- a/Plugin/Transform.cpp
+++ b/Plugin/Transform.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Transform.h"
 
diff --git a/Plugin/Transform.h b/Plugin/Transform.h
index d9bbc87b3ccd959529281c767d89a348e5a96ac5..8daa77336eab74ff417de66220b7a31beffe1c03 100644
--- a/Plugin/Transform.h
+++ b/Plugin/Transform.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TRANSFORM_H_
 #define _TRANSFORM_H_
diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp
index 60088ce4a7fb3b460bed6fca8cf7fd4abcef634a..0f59903bdc58348d5aee5530295eec2cf8e6d05c 100644
--- a/Plugin/Triangulate.cpp
+++ b/Plugin/Triangulate.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include <stdlib.h>
diff --git a/Plugin/Triangulate.h b/Plugin/Triangulate.h
index 133f9b89174cd60809c381d786982bcb39164af3..ea434c7eafb9170ce68ba8840e83e1571ca2a348 100644
--- a/Plugin/Triangulate.h
+++ b/Plugin/Triangulate.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TRIANGULATE_H_
 #define _TRIANGULATE_H_
diff --git a/Plugin/Warp.cpp b/Plugin/Warp.cpp
index 7874da0dc4b214662121955bfb04eef48cf0a128..a4558a63156c7fe8ce8f0ee61f3d8a95cc06ed7c 100644
--- a/Plugin/Warp.cpp
+++ b/Plugin/Warp.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Warp.h"
 #include "SmoothData.h"
diff --git a/Plugin/Warp.h b/Plugin/Warp.h
index 5a611cfbc8972a67753501cc688d2866370d3388..5cb6c128285cf9ca91b5f52efbb73866cbe452ee 100644
--- a/Plugin/Warp.h
+++ b/Plugin/Warp.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _WARP_H_
 #define _WARP_H_
diff --git a/Post/CMakeLists.txt b/Post/CMakeLists.txt
index b6bc8258b1f29d4cb3e5b47ffa595cf08d1d8326..93b13d39c1274cf00ddf6914823a96bd1914b878 100644
--- a/Post/CMakeLists.txt
+++ b/Post/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   PView.cpp PViewIO.cpp PViewVertexArrays.cpp
diff --git a/Post/ColorTable.cpp b/Post/ColorTable.cpp
index a10f34fc3ca88a6d1bac98a052761d3591bdd8df..79016a34cc4b201ede558319fe47fe0989f72150 100644
--- a/Post/ColorTable.cpp
+++ b/Post/ColorTable.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   David Colignon
diff --git a/Post/ColorTable.h b/Post/ColorTable.h
index d79f8a045a550ac4397b2ca280296e73e0e2d609..9c5905214a0efc00fc712656a1f435d0a2cd8db0 100644
--- a/Post/ColorTable.h
+++ b/Post/ColorTable.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _COLORTABLE_H_
 #define _COLORTABLE_H_
diff --git a/Post/OctreePost.cpp b/Post/OctreePost.cpp
index 6ae5a564c869d2f820ee61f233ff2ac989058eeb..174fc10b2d3df3fde4f610577d82612ef440cdaa 100644
--- a/Post/OctreePost.cpp
+++ b/Post/OctreePost.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Octree.h"
 #include "OctreePost.h"
diff --git a/Post/OctreePost.h b/Post/OctreePost.h
index 7e74c2a6c4a50c288d0ec8a8e1ef20c4b8c6d00a..ff7ddc0055645adf77a18145dfdaafd124fef82b 100644
--- a/Post/OctreePost.h
+++ b/Post/OctreePost.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCTREE_POST_H_
 #define _OCTREE_POST_H_
diff --git a/Post/PView.cpp b/Post/PView.cpp
index 8bfee1bbc357d1b87d052b3a7cb69f406e9d4af9..be9e1c2954df3c54b894e30b90247cfbb3d70dee 100644
--- a/Post/PView.cpp
+++ b/Post/PView.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <algorithm>
diff --git a/Post/PView.h b/Post/PView.h
index c44eb20db8c854ad4688ef870fdf3ec3cbec5b15..06eef510a6b1bcfb8dfc149db61ccabe6b8d2afa 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_H_
 #define _PVIEW_H_
diff --git a/Post/PViewAsSimpleFunction.cpp b/Post/PViewAsSimpleFunction.cpp
index ef8a946620d034d063f1ae721c11a7c4fc42c710..677ba979214f8f13adb155c5f73bc50c1b814fac 100644
--- a/Post/PViewAsSimpleFunction.cpp
+++ b/Post/PViewAsSimpleFunction.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "PView.h"
 #include "PViewData.h"
diff --git a/Post/PViewAsSimpleFunction.h b/Post/PViewAsSimpleFunction.h
index 2991b763f0cd067f38fff2e76955611ae72461c3..9fb511f2eccfd0b4085eec2b05444a9a1272dcfa 100644
--- a/Post/PViewAsSimpleFunction.h
+++ b/Post/PViewAsSimpleFunction.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_AS_SIMPLEFUNCTION_H
 #define _PVIEW_AS_SIMPLEFUNCTION_H
diff --git a/Post/PViewData.cpp b/Post/PViewData.cpp
index c877b76754b655872f95f342e2dd0f966bb011b9..903f860471874bcd2f5c124fd8f3792e9a3ea5d2 100644
--- a/Post/PViewData.cpp
+++ b/Post/PViewData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "PViewData.h"
 #include "adaptiveData.h"
diff --git a/Post/PViewData.h b/Post/PViewData.h
index 47f0c7cbc40c85aa8c40e852cec577d4684a0a3f..9a90bcd74f7987f774742666beb1e65ae1341ffa 100644
--- a/Post/PViewData.h
+++ b/Post/PViewData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_DATA_H_
 #define _PVIEW_DATA_H_
diff --git a/Post/PViewDataGModel.cpp b/Post/PViewDataGModel.cpp
index c8890625c54e607765bc30b2aabbc25d9228353f..4d6044ff0926e3cca9a30e902641d8dca36b88fb 100644
--- a/Post/PViewDataGModel.cpp
+++ b/Post/PViewDataGModel.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "PViewDataGModel.h"
 #include "MPoint.h"
diff --git a/Post/PViewDataGModel.h b/Post/PViewDataGModel.h
index 995be3c805a9388aba1aa53f02c2dcfb1e0da73e..c15c818830403f6a9e953bf22c3ce118a96acf6c 100644
--- a/Post/PViewDataGModel.h
+++ b/Post/PViewDataGModel.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_DATA_GMODEL_H_
 #define _PVIEW_DATA_GMODEL_H_
diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index a33ab4a9140ba8d8cb46188b01c5397a7fbd3141..7f56927ad3be214dcca1f5450a294ac70422412a 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Post/PViewDataIO.cpp b/Post/PViewDataIO.cpp
index ec0e0d63d43245e2f53236fc33ffe268287a3d6d..baf705ce83375c060951d36b997359e62dc51e30 100644
--- a/Post/PViewDataIO.cpp
+++ b/Post/PViewDataIO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <string.h>
diff --git a/Post/PViewDataList.cpp b/Post/PViewDataList.cpp
index f2d9fedc9854432e9b9de7b4104756d90391c350..8355487ea9ebf7024e50f2b2a3d415602cb51f5a 100644
--- a/Post/PViewDataList.cpp
+++ b/Post/PViewDataList.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "PViewDataList.h"
diff --git a/Post/PViewDataList.h b/Post/PViewDataList.h
index 5503d34ea0a55d4867a7736c513124e5d3afdd8b..9c1af06bd2405c7aa58ff8c1cff4a689aa68217b 100644
--- a/Post/PViewDataList.h
+++ b/Post/PViewDataList.h
@@ -2,7 +2,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_DATA_LIST_H_
 #define _PVIEW_DATA_LIST_H_
diff --git a/Post/PViewDataListIO.cpp b/Post/PViewDataListIO.cpp
index 34a13da24b2f90218f10e6d5b4c6cdaa9d3422d0..29f6af1e6a45c6bb481ebef31228a160ce445072 100644
--- a/Post/PViewDataListIO.cpp
+++ b/Post/PViewDataListIO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <set>
diff --git a/Post/PViewDataRemote.h b/Post/PViewDataRemote.h
index 71ecc766c7a43c9fe977df50ce5dcf02b178db29..0fcf3b23070adf8d9b6955f69cc633c5b987660b 100644
--- a/Post/PViewDataRemote.h
+++ b/Post/PViewDataRemote.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_DATA_REMOTE_H_
 #define _PVIEW_DATA_REMOTE_H_
diff --git a/Post/PViewFactory.cpp b/Post/PViewFactory.cpp
index fcb0970f1808c946bf1e11e887e194d9e1c72058..41e4f8f984fb06cff532f94ab19eedd897f15e2f 100644
--- a/Post/PViewFactory.cpp
+++ b/Post/PViewFactory.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "PViewFactory.h"
 #include "GModel.h"
diff --git a/Post/PViewFactory.h b/Post/PViewFactory.h
index 3cd6a887b778b2d18ffe55222749b168a029e2e6..2742e3718b215211445ce8756538b24c15906cd0 100644
--- a/Post/PViewFactory.h
+++ b/Post/PViewFactory.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_FACTORY_H_
 #define _PVIEW_FACTORY_H_
diff --git a/Post/PViewIO.cpp b/Post/PViewIO.cpp
index 134b5cd6432b826adb6a23596922f95fb9d0eaab..b2f1e8ebc9956b2cd1cfd6501d6a59e4afdfa0bb 100644
--- a/Post/PViewIO.cpp
+++ b/Post/PViewIO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Post/PViewOptions.cpp b/Post/PViewOptions.cpp
index 91c8adcd08773350c59d367c833482d32f90b313..3063fa645b58d90b5bd7678d13b28394ff0bc911 100644
--- a/Post/PViewOptions.cpp
+++ b/Post/PViewOptions.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "GmshConfig.h"
diff --git a/Post/PViewOptions.h b/Post/PViewOptions.h
index f1e27702eabea0ea1e28c65cb2d29792097a5a03..37cab72bcd6960c20f5b0953c75cb5a3114ec0fa 100644
--- a/Post/PViewOptions.h
+++ b/Post/PViewOptions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_OPTIONS_H_
 #define _PVIEW_OPTIONS_H_
diff --git a/Post/PViewVertexArrays.cpp b/Post/PViewVertexArrays.cpp
index 4eac9fdb9a14a1215219d2d69b60b951cc48a50a..a83cb0658f70217106cf3d0f4f1fd9663ebadeb1 100644
--- a/Post/PViewVertexArrays.cpp
+++ b/Post/PViewVertexArrays.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <algorithm>
diff --git a/Post/PViewX3D.cpp b/Post/PViewX3D.cpp
index 98834423c25aa045d4ba73bf4a471af1310249b8..4ed575c05a36f7ea2b9aa09aadb308ec338db9b1 100644
--- a/Post/PViewX3D.cpp
+++ b/Post/PViewX3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // PViewX3D is a extension for Post-processing outputs :
 // creates a file in X3D format with the same features as
diff --git a/Post/PViewX3D.h b/Post/PViewX3D.h
index 31bee52f15c92bace6274c4a232ad8c705ba9ff8..eada1ca8e1af36371a612fd5a6fae40d9b9d9b3b 100644
--- a/Post/PViewX3D.h
+++ b/Post/PViewX3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // PViewX3D is a extension for Post-processing outputs :
 // creates a file in X3D format with the same features as
diff --git a/Post/adaptiveData.cpp b/Post/adaptiveData.cpp
index 0e0f63d15883389c2ff0bc4662e8171b508a0282..acec26b02dbf049f9f9d10e0d6efb03b3c2c5ecf 100644
--- a/Post/adaptiveData.cpp
+++ b/Post/adaptiveData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include <list>
diff --git a/Post/adaptiveData.h b/Post/adaptiveData.h
index 2789f1708e3a97526606b7bedd61398edc9bdf5b..1ede5e5edd40a396fd65be311b6876649d7a41cd 100644
--- a/Post/adaptiveData.h
+++ b/Post/adaptiveData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ADAPTIVE_DATA_H_
 #define _ADAPTIVE_DATA_H_
diff --git a/Post/shapeFunctions.cpp b/Post/shapeFunctions.cpp
index 9bcdb829005923094fdaa55f6a5c42fbc72495fd..758f55c6b94f5f9ca97f6a4a977f45249e70b781 100644
--- a/Post/shapeFunctions.cpp
+++ b/Post/shapeFunctions.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "shapeFunctions.h"
 
diff --git a/Post/shapeFunctions.h b/Post/shapeFunctions.h
index 892fc3126a093ff490e86f2405f25f66c275447a..98d68bacf474eee5ff07b0109ea38508bc4e844c 100644
--- a/Post/shapeFunctions.h
+++ b/Post/shapeFunctions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SHAPE_FUNCTIONS_H_
 #define _SHAPE_FUNCTIONS_H_
diff --git a/Qt/CMakeLists.txt b/Qt/CMakeLists.txt
index abbc07b78dbb08bc6e30b5f1adaca8883a5c8df5..01142cb5f2fa5e83648d09cf8e39b56730b14249 100644
--- a/Qt/CMakeLists.txt
+++ b/Qt/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   QGui.cpp
diff --git a/Qt/GLWidget.cpp b/Qt/GLWidget.cpp
index ba0b6add0b548344708e969c9e675de73dcd60ee..00e7ccdb706bba6a1b81b4f793fe79bbb370b1ca 100644
--- a/Qt/GLWidget.cpp
+++ b/Qt/GLWidget.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <QtGui>
 #include <QtOpenGL>
diff --git a/Qt/GLWidget.h b/Qt/GLWidget.h
index 288214c9492af6031c79a85be74d6256574d5df1..830a9499bcac1ae8f5a63859b68d0530ff31e0f2 100644
--- a/Qt/GLWidget.h
+++ b/Qt/GLWidget.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GLWIDGET_H_
 #define _GLWIDGET_H_
diff --git a/Qt/Main.cpp b/Qt/Main.cpp
index 0ccfacc84644829bea9486039d5130215b0ee01a..998a418c7b4b0952c6843ccb00f8473122302e93 100644
--- a/Qt/Main.cpp
+++ b/Qt/Main.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Qt/QGui.cpp b/Qt/QGui.cpp
index 1f9d2632b6d17be937b3eb6a697e8ddf50e21bc4..a37284d2310a497e92225c7e12479ca49fd735b0 100644
--- a/Qt/QGui.cpp
+++ b/Qt/QGui.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <QtGui>
 #include <QWidget>
diff --git a/Qt/QGui.h b/Qt/QGui.h
index 8c86c42378d2ae58d1efdeddcee13fff2eda9dbd..a6af7c00fa1bf960584c899340685558b10a8855 100644
--- a/Qt/QGui.h
+++ b/Qt/QGui.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _Q_GUI_H_
 #define _Q_GUI_H_
diff --git a/Qt/graphicWindow.cpp b/Qt/graphicWindow.cpp
index 8b5ebca7e8cd97be1f81dbd1111033c242144919..c8783beafe068bde1d9eb72f0a4cd73e7d491893 100644
--- a/Qt/graphicWindow.cpp
+++ b/Qt/graphicWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <QtGui>
 #include "GLWidget.h"
diff --git a/Qt/graphicWindow.h b/Qt/graphicWindow.h
index a262062f5abcb9d0155f52b9f7b6e9c850531925..270d0cd97836a00e7fcb60360ee10b6d29025a7b 100644
--- a/Qt/graphicWindow.h
+++ b/Qt/graphicWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GRAPHIC_WINDOW_H_
 #define _GRAPHIC_WINDOW_H_
diff --git a/Solver/CMakeLists.txt b/Solver/CMakeLists.txt
index fc6ea3fb80db8beca6c4ae702e267ef6ed9e6195..27296158c9b522e960cd8e2017bc17a8fbc1f2df 100644
--- a/Solver/CMakeLists.txt
+++ b/Solver/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   linearSystem.cpp
diff --git a/Solver/FuncGradDisc.h b/Solver/FuncGradDisc.h
index 2b4c177cd9017b88fb8fd6092ad674247ec7769e..567a7dd9f05d283fc6a8ab2d97edc71b8202956b 100644
--- a/Solver/FuncGradDisc.h
+++ b/Solver/FuncGradDisc.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Boris Sedji
diff --git a/Solver/FuncHeaviside.h b/Solver/FuncHeaviside.h
index ea5fdda7699852cb2d13c10c5c7b87c07a8a89cb..8f058b42a3333fbec179af0795761548b69e8ba1 100644
--- a/Solver/FuncHeaviside.h
+++ b/Solver/FuncHeaviside.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Boris Sedji
diff --git a/Solver/SElement.cpp b/Solver/SElement.cpp
index 18ee69fde9dd26337fae4a2cd97853cefd8aad8e..11aa405df48bf1b203ebdc3e1930da78807d681f 100644
--- a/Solver/SElement.cpp
+++ b/Solver/SElement.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "SElement.h"
 
diff --git a/Solver/SElement.h b/Solver/SElement.h
index 3c9f8996c76304564ddfdc92e4b32c8049630265..4bd42c2d73422db46c9998a5640e868f9b2736e9 100644
--- a/Solver/SElement.h
+++ b/Solver/SElement.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SELEMENT_H_
 #define _SELEMENT_H_
diff --git a/Solver/STensor33.cpp b/Solver/STensor33.cpp
index 46b6bcb03d420bad7e50a9ddf5ae538507f81117..4887c8f67c155f19193ef283950d92e26f31d2d9 100644
--- a/Solver/STensor33.cpp
+++ b/Solver/STensor33.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/STensor33.h b/Solver/STensor33.h
index 70cadeebe68f4615db3f4c1670fb67169ca50212..f5aa5afeed529903a7704f2c6f2b3af5b874b4f8 100644
--- a/Solver/STensor33.h
+++ b/Solver/STensor33.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/STensor43.cpp b/Solver/STensor43.cpp
index 3e92a00630ed72b8185dc39cfb9ee02f6a95b7c3..7948aa76b3f127e16048bf95be97a1f883961f5b 100644
--- a/Solver/STensor43.cpp
+++ b/Solver/STensor43.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/STensor43.h b/Solver/STensor43.h
index db60e77fe256d96a9eceefdde20d4952ee895aa1..5e3372cc52e360c956b4c5dfd60b3cb33cc540f1 100644
--- a/Solver/STensor43.h
+++ b/Solver/STensor43.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/STensor53.cpp b/Solver/STensor53.cpp
index 25a9dbf9bc41758d1b32ebe9ffa8de2b708cc212..6dd307d6962b426b23bf0de8a7c97e4852d6ed2c 100644
--- a/Solver/STensor53.cpp
+++ b/Solver/STensor53.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "STensor53.h"
 
diff --git a/Solver/STensor53.h b/Solver/STensor53.h
index c1ec1d6170b943a6314ccae829c0c400f7e1edb4..559d34929738cfc88cd2aa2ae0805c95f8858e49 100644
--- a/Solver/STensor53.h
+++ b/Solver/STensor53.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 #ifndef STENSOR53_H_
 #define STENSOR53_H_
 
diff --git a/Solver/STensor63.cpp b/Solver/STensor63.cpp
index 6a09ef3411870d756e120ee672b6844248622c51..724e41ed5bf8b9d4c15b260bd58d4d25687e1650 100644
--- a/Solver/STensor63.cpp
+++ b/Solver/STensor63.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "STensor63.h"
 
diff --git a/Solver/STensor63.h b/Solver/STensor63.h
index 9e70a04de89d49c29956e7acf255c14dfe964afc..feb134e327e92ccaa11f5a75b883275ebad29cc7 100644
--- a/Solver/STensor63.h
+++ b/Solver/STensor63.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 #ifndef STENSOR63_H_
 #define STENSOR63_H_
 
diff --git a/Solver/convexCombinationTerm.h b/Solver/convexCombinationTerm.h
index ecf7864bb0a58d01c9ea8d53b439ed54d7a587a8..6532d57d54df2f1ca6069268c5ddeac2bd41454f 100644
--- a/Solver/convexCombinationTerm.h
+++ b/Solver/convexCombinationTerm.h
@@ -1,8 +1,7 @@
-
-// Gmsh - Copyright (C) 1997-2009 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CONVEX_COMBINATION_TERM_H_
 #define _CONVEX_COMBINATION_TERM_H_
@@ -27,8 +26,8 @@ class convexCombinationTerm : public femTerm<double> {
   {
     return se->getMeshElement()->getNumShapeFunctions();
   }
-  virtual int sizeOfC(SElement *se) const 
-  { 
+  virtual int sizeOfC(SElement *se) const
+  {
     return se->getMeshElement()->getNumShapeFunctions();
   }
   Dof getLocalDofR(SElement *se, int iRow) const
@@ -55,7 +54,7 @@ class convexCombinationTerm : public femTerm<double> {
 	  a = SVector3(vk->x()-vj->x(),vk->y()-vj->y(),vk->z()-vj->z());
 	  b = SVector3(vl->x()-vj->x(),vl->y()-vj->y(),vl->z()-vj->z());
 	  double angle = myacos(dot(a,b)/(norm(a)*norm(b)));
-	  tan = sin(angle*0.5)/cos(angle*0.5); 
+	  tan = sin(angle*0.5)/cos(angle*0.5);
 	}
 	double length  = vj->distance(vk);
 	m(j, k) = -tan/length; // mean value convex map
diff --git a/Solver/crossConfTerm.h b/Solver/crossConfTerm.h
index 13c4b91401138ddd3b1764ac46fde990ce4307a3..69b82cccecfe47437ce3522d866bc540e4e31484 100644
--- a/Solver/crossConfTerm.h
+++ b/Solver/crossConfTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CROSS_CONF_TERM_H_
 #define _CROSS_CONF_TERM_H_
diff --git a/Solver/diagBCTerm.h b/Solver/diagBCTerm.h
index 5d3b698d09befc95ff2d422303cda0a548e7fa7c..f3239540a4c3b0992c3893fbc31cc64fadeba22c 100644
--- a/Solver/diagBCTerm.h
+++ b/Solver/diagBCTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2009 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DIAGBC_TERM_H_
 #define _DIAGBC_TERM_H_
diff --git a/Solver/distanceTerm.h b/Solver/distanceTerm.h
index f0039e10b071da6fa2a373d297b48ad6245e71ac..1c28e7fb2b32ea5292ca95ab3f011546cf7720cb 100644
--- a/Solver/distanceTerm.h
+++ b/Solver/distanceTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISTANCE_TERM_H_
 #define _DISTANCE_TERM_H_
diff --git a/Solver/dofManager.cpp b/Solver/dofManager.cpp
index 3a3cc20d24f948a40ae03b1c3390a2109c3339e7..3c9d76aad27742dd06b75bc7cfe08b41fef82ead 100644
--- a/Solver/dofManager.cpp
+++ b/Solver/dofManager.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Solver/dofManager.h b/Solver/dofManager.h
index 484ab44af4ce5687679d453c51c379fbb004b37e..1ef5e5e4ac687250e1640b21ad6c0a7fa90ab71e 100644
--- a/Solver/dofManager.h
+++ b/Solver/dofManager.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DOF_MANAGER_H_
 #define _DOF_MANAGER_H_
diff --git a/Solver/eigenSolver.cpp b/Solver/eigenSolver.cpp
index 388a2cfb2eb73ca72556244df19d21f5c9ae9206..f17d30e97dab7e960b52f7101e63cd1afbd2cd46 100644
--- a/Solver/eigenSolver.cpp
+++ b/Solver/eigenSolver.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "eigenSolver.h"
 #include "OS.h"
diff --git a/Solver/eigenSolver.h b/Solver/eigenSolver.h
index e93d50fbe733db944eb4445664060b6cae11f7ad..b0ffa023b3b95bb9984912df0fae976981248955 100644
--- a/Solver/eigenSolver.h
+++ b/Solver/eigenSolver.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EIGEN_SOLVER_H_
 #define _EIGEN_SOLVER_H_
diff --git a/Solver/elasticitySolver.cpp b/Solver/elasticitySolver.cpp
index 10574bb29fd208446460f1986a8fd9ac061ed650..be544939fc1b15d55efc410c1b388cd398127fe9 100644
--- a/Solver/elasticitySolver.cpp
+++ b/Solver/elasticitySolver.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "GmshConfig.h"
diff --git a/Solver/elasticitySolver.h b/Solver/elasticitySolver.h
index 5a9f94f44e0d354269008141ff3faada1aea9bec..16d69d3aaa5727987431bb63717544ff54ec12c0 100644
--- a/Solver/elasticitySolver.h
+++ b/Solver/elasticitySolver.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ELASTICITY_SOLVER_H_
 #define _ELASTICITY_SOLVER_H_
diff --git a/Solver/elasticityTerm.cpp b/Solver/elasticityTerm.cpp
index 444c391aad863bdc22d689b253a27512a6154a88..81c54127ebaf490b609a566bbe5a50ec48b5d3e2 100644
--- a/Solver/elasticityTerm.cpp
+++ b/Solver/elasticityTerm.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "elasticityTerm.h"
 #include "Numeric.h"
diff --git a/Solver/elasticityTerm.h b/Solver/elasticityTerm.h
index 893d7b2a8f9f963983f347eb6b42bc27a45a0162..57293637f6e9a20991ab3b205d43488499f3f692 100644
--- a/Solver/elasticityTerm.h
+++ b/Solver/elasticityTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ELASTICITY_TERM_H_
 #define _ELASTICITY_TERM_H_
diff --git a/Solver/femTerm.h b/Solver/femTerm.h
index fe4816e8a9f7d4390f4db20f7ede2247ae090ab8..8a7c7fb0e4d526ddde4cb80f7d1a5c6169df8cef 100644
--- a/Solver/femTerm.h
+++ b/Solver/femTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FEM_TERM_H_
 #define _FEM_TERM_H_
diff --git a/Solver/filters.cpp b/Solver/filters.cpp
index 345e70fdf2352d0ab5cbecf64afdc87cc385700a..f7fdf6805b3bbb98ae8082499059fd5212c2e9a9 100644
--- a/Solver/filters.cpp
+++ b/Solver/filters.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Boris Sedji
diff --git a/Solver/filters.h b/Solver/filters.h
index e471ac364622efa1cf87601daee04ddd91b6ae1a..7a14fd197bcce3e45590565db9778d386ee5dbe8 100644
--- a/Solver/filters.h
+++ b/Solver/filters.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Boris Sedji
diff --git a/Solver/frameSolver.h b/Solver/frameSolver.h
index 3e361741ff51e96e4e4688ffc66e9016e133d8ad..453fb311d0f09ebf70e160d81b080b3811120a6c 100644
--- a/Solver/frameSolver.h
+++ b/Solver/frameSolver.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FRAME_SOLVER_H_
 #define _FRAME_SOLVER_H_
diff --git a/Solver/functionSpace.cpp b/Solver/functionSpace.cpp
index 2165754b748495b06c742f4bd47e9e87b44988a7..811860165718c847bab12b7dc71db60d51286b50 100644
--- a/Solver/functionSpace.cpp
+++ b/Solver/functionSpace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/functionSpace.h b/Solver/functionSpace.h
index 3131d90b4bf01721751e22c94924e05fef106104..4d3e7a21845e95c6a1fbf18261d4376b0c4ffc4e 100644
--- a/Solver/functionSpace.h
+++ b/Solver/functionSpace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FUNCTION_SPACE_H_
 #define _FUNCTION_SPACE_H_
diff --git a/Solver/groupOfElements.cpp b/Solver/groupOfElements.cpp
index 74785287b790aefd29e6e7f2f849e0bb38e5d7e5..61b1393ad8d12c74474fb8452afdcb2837f97002 100644
--- a/Solver/groupOfElements.cpp
+++ b/Solver/groupOfElements.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "groupOfElements.h"
 #include "GModel.h"
diff --git a/Solver/groupOfElements.h b/Solver/groupOfElements.h
index c398223084bf5861e382784424a6017e00993204..0561b31b9f00ca8c024f65294e9bd150f0f2e802 100644
--- a/Solver/groupOfElements.h
+++ b/Solver/groupOfElements.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GROUPOFELEMENTS_H_
 #define _GROUPOFELEMENTS_H_
diff --git a/Solver/helmholtzTerm.h b/Solver/helmholtzTerm.h
index d4c819c44578ec57db1ab9b9a979b45792b69058..44e064e743b29efaddc44cf4082961621cffcf31 100644
--- a/Solver/helmholtzTerm.h
+++ b/Solver/helmholtzTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HELMHOLTZ_TERM_H_
 #define _HELMHOLTZ_TERM_H_
diff --git a/Solver/laplaceTerm.h b/Solver/laplaceTerm.h
index 6cc5b70483d1204b445115152c63e9ab01fa9b35..66e367d536933e832920afbbd10ed0cc85d12379 100644
--- a/Solver/laplaceTerm.h
+++ b/Solver/laplaceTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LAPLACE_TERM_H_
 #define _LAPLACE_TERM_H_
diff --git a/Solver/linearSystem.cpp b/Solver/linearSystem.cpp
index 72fa39675435275c517e96e9304601cdc477b926..8601fa28adf6d810cf0829b6818e10dcb6c3f058 100644
--- a/Solver/linearSystem.cpp
+++ b/Solver/linearSystem.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "linearSystemFull.h"
 #include "linearSystemCSR.h"
diff --git a/Solver/linearSystem.h b/Solver/linearSystem.h
index 065298aab75a1b4e120bf14e6c1bfac4fbb8e83e..a2dca415acedbba5c28babc8c781a2060e264b4b 100644
--- a/Solver/linearSystem.h
+++ b/Solver/linearSystem.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_H_
 #define _LINEAR_SYSTEM_H_
diff --git a/Solver/linearSystemCSR.cpp b/Solver/linearSystemCSR.cpp
index 6a107e49837d178bd2d04319ba2e7ec8a15dbb75..1e73598062aa88836971e1811a8c8c5d85d9d163 100644
--- a/Solver/linearSystemCSR.cpp
+++ b/Solver/linearSystemCSR.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/Solver/linearSystemCSR.h b/Solver/linearSystemCSR.h
index 01662eb072bab2cf851ff25f9c9edaf0ff7637e9..baa6b870bcf9a510aa1ec2f8703ce233287a0b8e 100644
--- a/Solver/linearSystemCSR.h
+++ b/Solver/linearSystemCSR.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_CSR_H_
 #define _LINEAR_SYSTEM_CSR_H_
diff --git a/Solver/linearSystemFull.h b/Solver/linearSystemFull.h
index 2624fbd7f023110992172907f9329b8f04d785ed..173245dfa5cfdd502e0146bb8d94e08ca1702a8b 100644
--- a/Solver/linearSystemFull.h
+++ b/Solver/linearSystemFull.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_FULL_H_
 #define _LINEAR_SYSTEM_FULL_H_
diff --git a/Solver/linearSystemGMM.h b/Solver/linearSystemGMM.h
index c14e32c6c83ef01105a04b6e05fb87bb7509a280..41da6e76aefcd8e8fe44f0d710124049147418c2 100644
--- a/Solver/linearSystemGMM.h
+++ b/Solver/linearSystemGMM.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_GMM_H_
 #define _LINEAR_SYSTEM_GMM_H_
diff --git a/Solver/linearSystemMUMPS.cpp b/Solver/linearSystemMUMPS.cpp
index ea8e327c5d23d38990145544589438c363decee1..fe09aae114e139da9f7650a6a0d5b9969fc80792 100644
--- a/Solver/linearSystemMUMPS.cpp
+++ b/Solver/linearSystemMUMPS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 
 #include <stdio.h>
diff --git a/Solver/linearSystemMUMPS.h b/Solver/linearSystemMUMPS.h
index 951b8a7e0c7146c0188f539c23416d01554449fd..e8b953a5bb7ee8475450e3ffd9925d767b85bd25 100644
--- a/Solver/linearSystemMUMPS.h
+++ b/Solver/linearSystemMUMPS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_MUMPS_H_
 #define _LINEAR_SYSTEM_MUMPS_H_
diff --git a/Solver/linearSystemPETSc.cpp b/Solver/linearSystemPETSc.cpp
index b42fdb11bd0713f227d656a029925b82c7b751e9..76db880392ea9190dbac544e149dcd52bbc924ca 100644
--- a/Solver/linearSystemPETSc.cpp
+++ b/Solver/linearSystemPETSc.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include <string.h>
diff --git a/Solver/linearSystemPETSc.h b/Solver/linearSystemPETSc.h
index e57ebcf84049f9420308cfd7a3793d176c7197b8..df480e95b0059ad62b11b6bfa6386627c1c409db 100644
--- a/Solver/linearSystemPETSc.h
+++ b/Solver/linearSystemPETSc.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_PETSC_H_
 #define _LINEAR_SYSTEM_PETSC_H_
diff --git a/Solver/materialLaw.h b/Solver/materialLaw.h
index dafd2377d0291feb3cb3ab7021e512e5a801ef2e..8072cb0068e8f92a13da3b217ec32223d4a9b519 100644
--- a/Solver/materialLaw.h
+++ b/Solver/materialLaw.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/multiscaleLaplace.cpp b/Solver/multiscaleLaplace.cpp
index 90386530dd8723ece8a011f019c9143cedab4ab0..14b25fb6e3f94d5283e56413932c123fd6298ad4 100644
--- a/Solver/multiscaleLaplace.cpp
+++ b/Solver/multiscaleLaplace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Solver/multiscaleLaplace.h b/Solver/multiscaleLaplace.h
index 61b9be3a207b428ef2ca7a07b6f35d6b622f6269..b377456778c170c424027b148639475d51b6eee7 100644
--- a/Solver/multiscaleLaplace.h
+++ b/Solver/multiscaleLaplace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MULTISCALE_LAPLACE_H_
 #define _MULTISCALE_LAPLACE_H_
diff --git a/Solver/orthogonalTerm.h b/Solver/orthogonalTerm.h
index 43494c18acdbc0cd18cb84ec4e42d8180a85b50a..0ab0db9d2c140271bbb02af8d9a4fe023de4971d 100644
--- a/Solver/orthogonalTerm.h
+++ b/Solver/orthogonalTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ORTHOGONAL_TERM_H_
 #define _ORTHOGONAL_TERM_H_
diff --git a/Solver/quadratureRules.h b/Solver/quadratureRules.h
index 678616bef89df8d73f172f90f24834954a961045..d6cece12af41f9f17fff0cb04a302ef9ecef9b5f 100644
--- a/Solver/quadratureRules.h
+++ b/Solver/quadratureRules.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/solverAlgorithms.h b/Solver/solverAlgorithms.h
index 9aeb9155a02918fd1f5dccd75f54ac9549bfc5b7..f7be9c8c2c04af6e910f437194b26b919aad94d3 100644
--- a/Solver/solverAlgorithms.h
+++ b/Solver/solverAlgorithms.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/solverField.h b/Solver/solverField.h
index 461b792568845052c2b57f1b5fb14f091f334182..68760d81e1545c36aafa9f275d24e358de0ba5f1 100644
--- a/Solver/solverField.h
+++ b/Solver/solverField.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/sparsityPattern.cpp b/Solver/sparsityPattern.cpp
index 358cb8af42c645519f502a42deabde6e6b8e3ab6..a88181b2845bf9bd4c2c97405745e56507a53d84 100644
--- a/Solver/sparsityPattern.cpp
+++ b/Solver/sparsityPattern.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Jonathan Lambrechts
diff --git a/Solver/sparsityPattern.h b/Solver/sparsityPattern.h
index 6e172d595471c4c0f41a7ab1bf602dd9d3fa04ed..334c291f45b578b7ba428e30405ac3aa33fb9526 100644
--- a/Solver/sparsityPattern.h
+++ b/Solver/sparsityPattern.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPARSITY_PATTERN_H_
 #define _SPARSITY_PATTERN_H_
diff --git a/Solver/terms.cpp b/Solver/terms.cpp
index 7a7ded8210223f2d45d48f1ac7d7d85ba3135976..016b6fd63a66b2e2b02d6147d700f2ce0fb3d1b3 100644
--- a/Solver/terms.cpp
+++ b/Solver/terms.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/terms.h b/Solver/terms.h
index f1d62bd4f02aee4334db475b8a933c9964f9daee..49e01eb2d5ba0f54fe4e946e5d2cf62ffd76ab74 100644
--- a/Solver/terms.h
+++ b/Solver/terms.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/terms.hpp b/Solver/terms.hpp
index e7f354cf48e3568cf83e911aa024bc73d83b23c0..7a2885a8ecad74d6eacd1f1e8649bbbeb26ae0f3 100644
--- a/Solver/terms.hpp
+++ b/Solver/terms.hpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/thermicSolver.cpp b/Solver/thermicSolver.cpp
index a3ef7885ff69d36bc04fa13f0311821f29ba871c..d4240179187fba0cfa1c390522910ef7154cb06a 100644
--- a/Solver/thermicSolver.cpp
+++ b/Solver/thermicSolver.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to <gmsh@onelab.info>.
 
 #include <string.h>
 #include "GmshConfig.h"
diff --git a/Solver/thermicSolver.h b/Solver/thermicSolver.h
index 59c42456f0b5432edeef422b923024771c56d055..2f715c9149f085b3e520fa33e983ce82a5fceed3 100644
--- a/Solver/thermicSolver.h
+++ b/Solver/thermicSolver.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to <gmsh@onelab.info>.
 
 #ifndef _THERMIC_SOLVER_H_
 #define _THERMIC_SOLVER_H_
diff --git a/benchmarks/extrude_quadtri/READMEQUADTRI.txt b/benchmarks/extrude_quadtri/READMEQUADTRI.txt
index 6298e81b3f81b99aa09d35474da8c9a80b8e72d7..2c5cf8e2528e3f53f4da90f1f1ab3b266344349a 100644
--- a/benchmarks/extrude_quadtri/READMEQUADTRI.txt
+++ b/benchmarks/extrude_quadtri/READMEQUADTRI.txt
@@ -10,7 +10,7 @@ his contribution shall be cited appropriately.
 All code reused from Gmsh is Copyright (C) 1997-2013 C. Geuzaine, 
 J.-F. Remacle 
 
-Gmsh is available at: www.geuz.org/gmsh
+Gmsh is available at: www.gmsh.info
 
 See licensing information below.
 
diff --git a/benchmarks/extrude_quadtri/nico_torus.geo b/benchmarks/extrude_quadtri/nico_torus.geo
index e5fcdd3ecb8fcc4c870473c8682bcac2c5a6548a..d243d04db606e4bc1be980ad743beee3c10577aa 100644
--- a/benchmarks/extrude_quadtri/nico_torus.geo
+++ b/benchmarks/extrude_quadtri/nico_torus.geo
@@ -1,5 +1,5 @@
 // This file was originally written by Nico Schloemer,
-// Citation: http://geuz.org/pipermail/gmsh/2012/007576.html
+// Citation: http://onelab.info/pipermail/gmsh/2012/007576.html
 
 //set options
 Geometry.Surfaces=1;
@@ -76,4 +76,4 @@ lcar = 0.05;
 orad = 0.5;
 irad = 0.15;
 zshift = 0.04;
-Call Torus;
\ No newline at end of file
+Call Torus;
diff --git a/contrib/ANN/CMakeLists.txt b/contrib/ANN/CMakeLists.txt
index 695d23311892b1d71cdaa85abd44e2a9d7504adc..0af8bb24990abc1ac9d49127b0292d18d87a1a9b 100644
--- a/contrib/ANN/CMakeLists.txt
+++ b/contrib/ANN/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   src/ANN.cpp
diff --git a/contrib/Chaco/CMakeLists.txt b/contrib/Chaco/CMakeLists.txt
index f201444d61b592fb721fc009f3d36d3dcaed2e6b..fc28cb2689dec40a6c825f469a47ae9a738d64a3 100644
--- a/contrib/Chaco/CMakeLists.txt
+++ b/contrib/Chaco/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   main/Gmsh_printf.cpp main/Gmsh_exit.cpp
diff --git a/contrib/Chaco/main/Gmsh_exit.cpp b/contrib/Chaco/main/Gmsh_exit.cpp
index a150ff20c1524285d204fc83757243047d349bd1..b032ce7704fcdf65762049e6d1d173b8c5bdf6c2 100644
--- a/contrib/Chaco/main/Gmsh_exit.cpp
+++ b/contrib/Chaco/main/Gmsh_exit.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdexcept>
 
diff --git a/contrib/Chaco/main/Gmsh_exit.h b/contrib/Chaco/main/Gmsh_exit.h
index 431f5737b7a0542848d5b931e33fc4e08eb5fde7..d8a5178202558b7d3e52e2c452946bd98cfeefe7 100644
--- a/contrib/Chaco/main/Gmsh_exit.h
+++ b/contrib/Chaco/main/Gmsh_exit.h
@@ -1,7 +1,7 @@
 /* Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
  *
  * See the LICENSE.txt file for license information. Please report all
- * bugs and problems to the public mailing list <gmsh@geuz.org>.
+ * bugs and problems to the public mailing list <gmsh@onelab.info>.
  */
 #ifndef _GMSH_EXIT_H_
 #define _GMSH_EXIT_H_
diff --git a/contrib/Chaco/main/Gmsh_printf.cpp b/contrib/Chaco/main/Gmsh_printf.cpp
index c0aaa2709c993815995f2721970e32c389f042ea..9cbb56beb974d8febf6ba95df22754d96de3f68e 100644
--- a/contrib/Chaco/main/Gmsh_printf.cpp
+++ b/contrib/Chaco/main/Gmsh_printf.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <cstdio>
 #include <cstring>
diff --git a/contrib/Chaco/main/Gmsh_printf.h b/contrib/Chaco/main/Gmsh_printf.h
index 8c85be8e38c012c9c03961f7f18d1b57610dfbb1..318bff1496b94579fb59ed57d31b8c88cf3638ce 100644
--- a/contrib/Chaco/main/Gmsh_printf.h
+++ b/contrib/Chaco/main/Gmsh_printf.h
@@ -1,7 +1,7 @@
 /* Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
  *
  * See the LICENSE.txt file for license information. Please report all
- * bugs and problems to the public mailing list <gmsh@geuz.org>.
+ * bugs and problems to the public mailing list <gmsh@onelab.info>.
  */
 #ifndef _GMSH_PRINTF_H_
 #define _GMSH_PRINTF_H_
diff --git a/contrib/DiscreteIntegration/CMakeLists.txt b/contrib/DiscreteIntegration/CMakeLists.txt
index e9ff36c0ccdab2bf212b3bfd9ac9fb33ec590c1f..8e557a02daed755822e69caa218fd4d8643af8d3 100644
--- a/contrib/DiscreteIntegration/CMakeLists.txt
+++ b/contrib/DiscreteIntegration/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Integration3D.cpp
diff --git a/contrib/HighOrderMeshOptimizer/CMakeLists.txt b/contrib/HighOrderMeshOptimizer/CMakeLists.txt
index 6c62397154ab0ad49e3c7b1b18aa5afc60f0586d..559fc502ff3c1a08884307801c1e347a1a6bf293 100644
--- a/contrib/HighOrderMeshOptimizer/CMakeLists.txt
+++ b/contrib/HighOrderMeshOptimizer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   OptHomMesh.cpp 
diff --git a/contrib/HighOrderMeshOptimizer/OptHOM.cpp b/contrib/HighOrderMeshOptimizer/OptHOM.cpp
index 3200e1bd2f70974a1dabd147b80b0ba48766f8ba..ca081c94cd6a2384e7691e1068c3b94cdf497b5e 100644
--- a/contrib/HighOrderMeshOptimizer/OptHOM.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHOM.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHOM.h b/contrib/HighOrderMeshOptimizer/OptHOM.h
index 7e1c61448989aaf39752ab60fb92538f4f8b8a0b..179e19be2ad152211f03a5b4eeefee265375644d 100644
--- a/contrib/HighOrderMeshOptimizer/OptHOM.h
+++ b/contrib/HighOrderMeshOptimizer/OptHOM.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp b/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp
index de791fef05d964f8dfde7c811c66ce29e55158e3..88c14d74fe6270f62391051169a4df84d227b37b 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #include "OptHomElastic.h"
 #include "GModel.h"
diff --git a/contrib/HighOrderMeshOptimizer/OptHomElastic.h b/contrib/HighOrderMeshOptimizer/OptHomElastic.h
index 2295e4eeecb2fb5f5e87fa4d945bc72f468b647f..58ef5a83f0fedccaec447f1bdd730d278aa68af1 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomElastic.h
+++ b/contrib/HighOrderMeshOptimizer/OptHomElastic.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _OPT_HOM_ELASTIC_H_
 #define _OPT_HOM_ELASTIC_H_
diff --git a/contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp b/contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp
index 58b9df9bc2c6627cc8268f23ae4f9c281548a390..34c59b566c715c494a9199681e3f1942090e5e51 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomFastCurving.h b/contrib/HighOrderMeshOptimizer/OptHomFastCurving.h
index 9b114915daaf47b0d43f6cb0a85c46022e61f5a2..7fd62f20befdac1f224ae91442340e912f8913cf 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomFastCurving.h
+++ b/contrib/HighOrderMeshOptimizer/OptHomFastCurving.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp b/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp
index dbea55ed27232527a68af49daad108a5ab78548c..9ffdebb4e08322731d073e53568550d3db4700be 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomMesh.h b/contrib/HighOrderMeshOptimizer/OptHomMesh.h
index 696a19b0c286562d3db711d8cf5d0bf9f473b292..8ccdd35e4513f78fd91d4b25c5f3af76baa48d83 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomMesh.h
+++ b/contrib/HighOrderMeshOptimizer/OptHomMesh.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
index 87844e29c5fa959e16ccd47136b96e816c55bd95..dfe512dae405ad9df3194a71a4895a8b74fa3609 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomRun.h b/contrib/HighOrderMeshOptimizer/OptHomRun.h
index df3e4601612f30cffa27f3c67e0658a2555c45cd..88b162e25051920439d8f42892b1e69e4f59f4c4 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomRun.h
+++ b/contrib/HighOrderMeshOptimizer/OptHomRun.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/ParamCoord.cpp b/contrib/HighOrderMeshOptimizer/ParamCoord.cpp
index 88125af7f336b5fd2e86cc0f5cc1780b2b0628e4..579dccd4c1dd9c253a4067be335f3a405a3183ba 100644
--- a/contrib/HighOrderMeshOptimizer/ParamCoord.cpp
+++ b/contrib/HighOrderMeshOptimizer/ParamCoord.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributor(s): Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/ParamCoord.h b/contrib/HighOrderMeshOptimizer/ParamCoord.h
index a0bb4f597ef6be4b49777cf2ca4f6c5dee5a46ab..e8a6cd84f7e3705d1cc3476b312f6b9cd70a742e 100644
--- a/contrib/HighOrderMeshOptimizer/ParamCoord.h
+++ b/contrib/HighOrderMeshOptimizer/ParamCoord.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/SuperEl.cpp b/contrib/HighOrderMeshOptimizer/SuperEl.cpp
index d7ec149660775b6af11270e291ec012945abd8b9..845c548d93fdb3f4bf463c7b4862da5cb7f1a8d6 100644
--- a/contrib/HighOrderMeshOptimizer/SuperEl.cpp
+++ b/contrib/HighOrderMeshOptimizer/SuperEl.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributor: Thomas Toulorge
 
diff --git a/contrib/HighOrderMeshOptimizer/SuperEl.h b/contrib/HighOrderMeshOptimizer/SuperEl.h
index b3604951767d9ae96b1db31b9a122527642b45fa..180c013b12fc41a1290bcea41ebda9de769f93eb 100644
--- a/contrib/HighOrderMeshOptimizer/SuperEl.h
+++ b/contrib/HighOrderMeshOptimizer/SuperEl.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributor: Thomas Toulorge
 
diff --git a/contrib/MathEx/CMakeLists.txt b/contrib/MathEx/CMakeLists.txt
index e73d5cf4857d27d2756fd65fd545e9e14fb0779f..8f3964f1100f0d23a416c929cb3fce9d3aac2295 100644
--- a/contrib/MathEx/CMakeLists.txt
+++ b/contrib/MathEx/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   mathex.cpp
diff --git a/contrib/MeshOptimizer/CMakeLists.txt b/contrib/MeshOptimizer/CMakeLists.txt
index c1ae9d7b6cec079eac09669b5e74bbd16ed702e4..0b185d9a22fc0fc661e6793abf1717f439f79a7c 100644
--- a/contrib/MeshOptimizer/CMakeLists.txt
+++ b/contrib/MeshOptimizer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   MeshOpt.cpp
diff --git a/contrib/MeshOptimizer/MeshOpt.cpp b/contrib/MeshOptimizer/MeshOpt.cpp
index abc73e7b08ba6b1315240954d7f1f91463a7b2a0..4112cb91adc3013c3f00c0a14f50d43845fcd2c6 100644
--- a/contrib/MeshOptimizer/MeshOpt.cpp
+++ b/contrib/MeshOptimizer/MeshOpt.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOpt.h b/contrib/MeshOptimizer/MeshOpt.h
index d132bb9410876b3085acb7e41906cdab6318f949..737b8549886aee2b1f94bf0a11852d33f2449900 100644
--- a/contrib/MeshOptimizer/MeshOpt.h
+++ b/contrib/MeshOptimizer/MeshOpt.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptCommon.cpp b/contrib/MeshOptimizer/MeshOptCommon.cpp
index 62ff7b01774b42f4a60ef457bb8a28032dbc5825..5a9f787905a1f32b22cc968a513a9e5e7b3996fe 100644
--- a/contrib/MeshOptimizer/MeshOptCommon.cpp
+++ b/contrib/MeshOptimizer/MeshOptCommon.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptCommon.h b/contrib/MeshOptimizer/MeshOptCommon.h
index 232fd359c2f805fc49ca22293a32f8ab476b77fe..900d35127b196dc19ea6d2b0baac6e5f7c77c1ae 100644
--- a/contrib/MeshOptimizer/MeshOptCommon.h
+++ b/contrib/MeshOptimizer/MeshOptCommon.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptPatch.cpp b/contrib/MeshOptimizer/MeshOptPatch.cpp
index 1aff778db46a6bbb3f214f178489ddc71aeadd80..47d6df65c2a9be464a93e76b8dcc83c750514751 100644
--- a/contrib/MeshOptimizer/MeshOptPatch.cpp
+++ b/contrib/MeshOptimizer/MeshOptPatch.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptPatch.h b/contrib/MeshOptimizer/MeshOptPatch.h
index baa3b0b7b2dc4f780a487e80e8db2825c499d1bf..5c482de325e2fdef748e34ccd698e12c63f8acd9 100644
--- a/contrib/MeshOptimizer/MeshOptPatch.h
+++ b/contrib/MeshOptimizer/MeshOptPatch.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptVertexCoord.cpp b/contrib/MeshOptimizer/MeshOptVertexCoord.cpp
index 073e97ce216b4a3391b926df1af9f51210729ad7..a4bf6853ac84f77f74a129f8e5a92c9cde4ffbe5 100644
--- a/contrib/MeshOptimizer/MeshOptVertexCoord.cpp
+++ b/contrib/MeshOptimizer/MeshOptVertexCoord.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributor(s): Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptVertexCoord.h b/contrib/MeshOptimizer/MeshOptVertexCoord.h
index 3a1c00df068a1e17323238f2befdc549a8a28fd5..5094f220f19daf524de50e54b858efe92452644b 100644
--- a/contrib/MeshOptimizer/MeshOptVertexCoord.h
+++ b/contrib/MeshOptimizer/MeshOptVertexCoord.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptimizer.cpp b/contrib/MeshOptimizer/MeshOptimizer.cpp
index 924081d243a14b9c18d0af60dec83742010caa56..5754127c59a321677ff9e3ab17ffdfad10fc1e46 100644
--- a/contrib/MeshOptimizer/MeshOptimizer.cpp
+++ b/contrib/MeshOptimizer/MeshOptimizer.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptimizer.h b/contrib/MeshOptimizer/MeshOptimizer.h
index b3ed8940a21bf7c5b5b3b4e753431cd828971a83..76a6690481fb2d5ac3ee7e3cdf4000abaf99d2e8 100644
--- a/contrib/MeshOptimizer/MeshOptimizer.h
+++ b/contrib/MeshOptimizer/MeshOptimizer.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshQualityOptimizer/CMakeLists.txt b/contrib/MeshQualityOptimizer/CMakeLists.txt
index d8ddd3a30ed6c48dfd056342c91372fc1b3c9eb4..f68e993e2b37dc2699a62b900860ef97b943f922 100644
--- a/contrib/MeshQualityOptimizer/CMakeLists.txt
+++ b/contrib/MeshQualityOptimizer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   MeshQualityOptimizer.cpp
diff --git a/contrib/MeshQualityOptimizer/MeshQualityOptimizer.h b/contrib/MeshQualityOptimizer/MeshQualityOptimizer.h
index 3959e04834c038376089dbeb5d1f3c606491603c..630bd3f90d4166ddcf06bfb4ce5a1b2e438a503a 100644
--- a/contrib/MeshQualityOptimizer/MeshQualityOptimizer.h
+++ b/contrib/MeshQualityOptimizer/MeshQualityOptimizer.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/Metis/CMakeLists.txt b/contrib/Metis/CMakeLists.txt
index 819d81a4b46aacaae595fb28fa54264cfd0f01f7..84d1c1a2e768b6d0e86ec632af349becd837fe22 100644
--- a/contrib/Metis/CMakeLists.txt
+++ b/contrib/Metis/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   balance.c 
diff --git a/contrib/Netgen/CMakeLists.txt b/contrib/Netgen/CMakeLists.txt
index c8d4177d31d69f4adc824187be9faf84e0c360fd..1d2d6dbce7ac08a332c8d0fb0555b2477b53bb28 100644
--- a/contrib/Netgen/CMakeLists.txt
+++ b/contrib/Netgen/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(gen libsrc/general)
 set(lin libsrc/linalg)
diff --git a/contrib/Salome/CMakeLists.txt b/contrib/Salome/CMakeLists.txt
index 94faae27841ff257e1df74376779ef4f2f3e2361..456bc195fcf95fa66fa8653fac0f2f18bacde79e 100644
--- a/contrib/Salome/CMakeLists.txt
+++ b/contrib/Salome/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Partition_Inter2d.cxx 
diff --git a/contrib/Tetgen1.4/CMakeLists.txt b/contrib/Tetgen1.4/CMakeLists.txt
index 89e275c358b491d2e48331cc258abb8f323af9ea..6b1004a40a334ed5756cee0e12197c49b1e05ee3 100644
--- a/contrib/Tetgen1.4/CMakeLists.txt
+++ b/contrib/Tetgen1.4/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   tetgen.cxx
diff --git a/contrib/Tetgen1.5/CMakeLists.txt b/contrib/Tetgen1.5/CMakeLists.txt
index c2a041cefcbbf8fce01f9c0186c76e17eadb2017..5dedb56984cfa6e4f8e8729ab9a69f796b81366d 100644
--- a/contrib/Tetgen1.5/CMakeLists.txt
+++ b/contrib/Tetgen1.5/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   tetgen.cxx
diff --git a/contrib/bamg/CMakeLists.txt b/contrib/bamg/CMakeLists.txt
index 264b03b7a33aa4f67cbdfe42c8a77e084a4b519d..735a65b33a2c1c345001257758ab46e8fa63d629 100644
--- a/contrib/bamg/CMakeLists.txt
+++ b/contrib/bamg/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Mesh2d.cpp 
diff --git a/contrib/blossom/CMakeLists.txt b/contrib/blossom/CMakeLists.txt
index 04ba49fde26d4db68f29911e12708e227f6e4432..a67be0ea67bbbaedef61a67408d7a8a8c2303a33 100644
--- a/contrib/blossom/CMakeLists.txt
+++ b/contrib/blossom/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
 # concorde97/BIGGUY/bg_test.c
diff --git a/contrib/kbipack/CMakeLists.txt b/contrib/kbipack/CMakeLists.txt
index 81c88876878def5fe7679db4165d1173a00f1373..fa4c497aefd83f98a39b6588bc359a1ff238287d 100644
--- a/contrib/kbipack/CMakeLists.txt
+++ b/contrib/kbipack/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   gmp_normal_form.cpp
diff --git a/contrib/mmg3d/CMakeLists.txt b/contrib/mmg3d/CMakeLists.txt
index fb8ab2938f856996c1c516e272951ea61ccb9a12..4749f834de836e12a29e3367c6d21bcf9bb79e12 100644
--- a/contrib/mmg3d/CMakeLists.txt
+++ b/contrib/mmg3d/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
 ./build/sources/mmg3d.c
diff --git a/contrib/mobile/androidUtils.cpp b/contrib/mobile/androidUtils.cpp
index 86e8682db53a4938f22f2413712987f748476179..5d62f459ca4ee831cb759804b54f065bd6c9e0b0 100644
--- a/contrib/mobile/androidUtils.cpp
+++ b/contrib/mobile/androidUtils.cpp
@@ -314,8 +314,8 @@ extern "C" {
             << "Version " << GMSH_VERSION << " "
             << "(<i>Build date:</i> " << GMSH_DATE << ")"
             << "<p>Copyright (C) 1997-2015 Christophe Geuzaine and Jean-Fran&ccedil;ois Remacle</p>"
-            << "<p><a href=\"http://geuz.org/gmsh/doc/CREDITS.txt\">Credits</a> "
-            << "and <a href=\"http://geuz.org/gmsh/doc/LICENSE.txt\">licensing information</a></p>"
+            << "<p><a href=\"http://gmsh.info/doc/CREDITS.txt\">Credits</a> "
+            << "and <a href=\"http://gmsh.info/doc/LICENSE.txt\">licensing information</a></p>"
             << "<p><i>Build options:</i> " << GMSH_CONFIG_OPTIONS << "</p>"
             << "<p>Visit <a href=\"http://gmsh.info\">http://gmsh.info</a> for more information</p></center>";
     return env->NewStringUTF(sstream.str().c_str());
@@ -328,8 +328,8 @@ extern "C" {
             << "Version " << GETDP_VERSION << " "
             << "(<i>Build date:</i> " << GETDP_DATE << ")"
             << "<p>Copyright (C) 1997-2015 Patrick Dular and Christophe Geuzaine, University of Li&egrave;ge</p>"
-            << "<p><a href=\"http://geuz.org/getdp/doc/CREDITS.txt\">Credits</a> "
-            << "and <a href=\"http://geuz.org/getdp/doc/LICENSE.txt\">licensing information</a></p>"
+            << "<p><a href=\"http://getdp.info/doc/CREDITS.txt\">Credits</a> "
+            << "and <a href=\"http://getdp.info/doc/LICENSE.txt\">licensing information</a></p>"
             << "<p><i>Build options:</i> " << GETDP_CONFIG_OPTIONS << "</p>"
             << "<p>Visit <a href=\"http://getdp.info\">http://getdp.info</a> for more information</p></center>";
     return env->NewStringUTF(sstream.str().c_str());
diff --git a/contrib/mpeg_encode/CMakeLists.txt b/contrib/mpeg_encode/CMakeLists.txt
index 7977a78e81296c2a45145fbe927a0808ca47a46d..7c6426b605dfb1e175567e28b63704ae2a348208 100644
--- a/contrib/mpeg_encode/CMakeLists.txt
+++ b/contrib/mpeg_encode/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   bframe.cpp
diff --git a/contrib/onelab/CMakeLists.txt b/contrib/onelab/CMakeLists.txt
index 369ffd1c8ce853dc070fbc76e258ab537454b85b..b9ed98da34fe298a4a805ab71ea180d55c8d03cb 100644
--- a/contrib/onelab/CMakeLists.txt
+++ b/contrib/onelab/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   OnelabClients.cpp 
diff --git a/contrib/onelab/OnelabClients.h b/contrib/onelab/OnelabClients.h
index e43e6355c12418e557afc585ee412dadb6c8485d..ed96596b689740febe55eb5f3bc64c6f64a82fce 100644
--- a/contrib/onelab/OnelabClients.h
+++ b/contrib/onelab/OnelabClients.h
@@ -1,7 +1,7 @@
 // ONELAB - Copyright (C) 2010-2012 C. Geuzaine, F. Henrotte
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ONELAB_CLIENTS_H_
 #define _ONELAB_CLIENTS_H_
diff --git a/contrib/onelab/OnelabMessage.cpp b/contrib/onelab/OnelabMessage.cpp
index e078cdec8e72dca5e7f45fa0df7f05495bd0f843..e73e005ff4653427416a9dee35e3196fbb524e93 100644
--- a/contrib/onelab/OnelabMessage.cpp
+++ b/contrib/onelab/OnelabMessage.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/contrib/onelab/OnelabMessage.h b/contrib/onelab/OnelabMessage.h
index 383afe79915c2e2eea36434026498568f6048778..2a56043ac09dfa11f46558be0f22940963c57b0c 100644
--- a/contrib/onelab/OnelabMessage.h
+++ b/contrib/onelab/OnelabMessage.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2012 C. Geuzaine, F. Henrotte
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ONELAB_MESSAGE_H_
 #define _ONELAB_MESSAGE_H_
diff --git a/contrib/onelab/metamodel.h b/contrib/onelab/metamodel.h
index 27e1e87d390d74d0c5711cda05d9f43f8fcba6bf..ec3b97a0695d9f3deaf16d4f779a21f6f29c7759 100644
--- a/contrib/onelab/metamodel.h
+++ b/contrib/onelab/metamodel.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2012 C. Geuzaine, F. Henrotte
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 
diff --git a/contrib/onelab/myOS.cpp b/contrib/onelab/myOS.cpp
index fb5d3d5fd5e78f9e93ed6f21ea2fe01e51fb039d..2a2ff766f880ccee12f5e2db6938dcf5e821b6e5 100644
--- a/contrib/onelab/myOS.cpp
+++ b/contrib/onelab/myOS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // This file contains a bunch of functions that depend on OS-dependent
 // features and/or system calls
diff --git a/contrib/onelab/myOS.h b/contrib/onelab/myOS.h
index a685f8a957b7d3ed26260838bf8c4432beba3325..615857beb08361afbc5544c1844b5b764051ed97 100644
--- a/contrib/onelab/myOS.h
+++ b/contrib/onelab/myOS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OS_H_
 #define _OS_H_
diff --git a/contrib/onelab/python/onelab.py b/contrib/onelab/python/onelab.py
index 3d0d08c674d2621b0532bb386bfa6b9491e1d699..7dc106fbe4dd64e91dccdb21a2565b6289544611 100755
--- a/contrib/onelab/python/onelab.py
+++ b/contrib/onelab/python/onelab.py
@@ -24,7 +24,7 @@ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 OF THIS SOFTWARE.
 
 Please report all bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 """
 
 import socket, struct, os, sys, subprocess, time
diff --git a/contrib/onelab2/python/onelab2.py b/contrib/onelab2/python/onelab2.py
index 7397f85add6cb54ce108df5aff15c7b7a0bd7202..b97ac7e5e9906b0cd3c5ebbd9157f02098313ae9 100755
--- a/contrib/onelab2/python/onelab2.py
+++ b/contrib/onelab2/python/onelab2.py
@@ -24,7 +24,7 @@ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 OF THIS SOFTWARE.
 
 Please report all bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 """
 
 import socket, struct, os, sys, subprocess
diff --git a/contrib/taucs/CMakeLists.txt b/contrib/taucs/CMakeLists.txt
index 7bbda2e12e7675bd11c9b2cff39e15da3605ae01..c977af31d7099cb4094b99447b7fb32fb45937fd 100644
--- a/contrib/taucs/CMakeLists.txt
+++ b/contrib/taucs/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 # contributor : Jonathan Lambrechts
 
diff --git a/contrib/zipper/CMakeLists.txt b/contrib/zipper/CMakeLists.txt
index 45ef830a7315c18f33a61615378b311576376c6b..5a6a149ff9d3d10253b99dd94174b1f3519db4f6 100644
--- a/contrib/zipper/CMakeLists.txt
+++ b/contrib/zipper/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   zip.c
diff --git a/doc/gmsh.html b/doc/gmsh.html
index cea2eeb0549a4257820fd8cc90838ff92f23d1d5..a7e1fafcd3df73a3cee0d2dc09981eca2c505cb3 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -177,19 +177,19 @@ algorithms</a>.
   <li><a href="doc/VERSIONS.txt">Version history</a>
   <li>Mailing lists:
     <ul>
-      <li><a href="http://geuz.org/mailman/listinfo/gmsh/">gmsh</a>
-        (archived <a href="http://geuz.org/pipermail/gmsh/">here</a>) is the public
+      <li><a href="http://onelab.info/mailman/listinfo/gmsh/">gmsh</a>
+        (archived <a href="http://onelab.info/pipermail/gmsh/">here</a>) is the public
         mailing list for Gmsh discussions, and is the best place to
         ask questions (and get answers!)
-      <li><a href="http://geuz.org/mailman/listinfo/gmsh-announce/">gmsh-announce</a> (archived
-        <a href="http://geuz.org/pipermail/gmsh-announce/">here</a>) is a moderated
+      <li><a href="http://onelab.info/mailman/listinfo/gmsh-announce/">gmsh-announce</a> (archived
+        <a href="http://onelab.info/pipermail/gmsh-announce/">here</a>) is a moderated
         ("read-only") list for announcements about new releases and
         other Gmsh news
     </ul>
 </ul>
 
 <p>
-Please use the public mailing list <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org</a>
+Please use the public mailing list <a HREF="mailto:gmsh@onelab.info">gmsh@onelab.info</a>
 to send questions or ask for help. If you think you have found a bug in the
 program, you can file a report directly
 <a href="https://onelab.info/trac/gmsh/newticket" data-tooltip=
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 878fabb6fa63146510b682f1e144ebfd6df82587..eb171dcad92416567a0f686ced77c8f4169024e1 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -2,7 +2,7 @@
 @c Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 @c
 @c See the LICENSE.txt file for license information. Please report all
-@c bugs and problems to the public mailing list <gmsh@geuz.org>.
+@c bugs and problems to the public mailing list <gmsh@onelab.info>.
 @c
 @c =========================================================================
 @c
diff --git a/utils/api_demos/mainHomology.cpp b/utils/api_demos/mainHomology.cpp
index dc20038f41c018b5869f90f1d7edd2fa10105074..7f7428ee5b1e5198ff6531cf4823573958b6784f 100644
--- a/utils/api_demos/mainHomology.cpp
+++ b/utils/api_demos/mainHomology.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@tut.fi>.
 //
diff --git a/utils/converters/autocad/dxf2geo.cpp b/utils/converters/autocad/dxf2geo.cpp
index a7af2d48728aba43889f8cdae5c22ddbc3cc8727..93b7d90fa2a335e45d20121ad464764a80b616ac 100644
--- a/utils/converters/autocad/dxf2geo.cpp
+++ b/utils/converters/autocad/dxf2geo.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   David Colignon
diff --git a/utils/converters/autocad/dxf2msh.c b/utils/converters/autocad/dxf2msh.c
index 26a772259e13a31b02a73ffc91b634984f0bf86a..300d7ee439ad94bbc517e463bf356e8ea6e4dea6 100644
--- a/utils/converters/autocad/dxf2msh.c
+++ b/utils/converters/autocad/dxf2msh.c
@@ -1,13 +1,13 @@
 /* $Id: dxf2msh.c,v 1.1 2003-05-09 21:58:54 geuzaine Exp $ */
 
-/* 
+/*
    AutoCAD DXF to GMSH .msh Data File Converter
 
    David.Colignon@AdValvas.be
-   
+
    This is a hack from the Autocad DXF to DKB .Data file translator Version 1.0
    written by Aaron A. Collins (8/13/90) ( http://www.sdsc.edu/~mjb/mae152/dxf.spec.txt )
-   and from dxf2geo by Christophe Geuzaine ( http://www.geuz.org/gmsh )
+   and from dxf2geo by Christophe Geuzaine ( http://www.gmsh.info )
 
 */
 
@@ -25,7 +25,7 @@ FILE    *infile, *outfile ;
 char    inname[80], outname[80], curobj[80], linbuf[BUFSIZE];
 int     i, groupcode, num_p=1 , num_l=1 , num_tt=1 ;
 int     cpt_p=1, nb_p, *new_num_pt, cpt_l=1, nb_l, *new_num_l ;
-int     nb_tt, sl , *List_Fa_1, *List_Fa_2 , *Test_ori ; 
+int     nb_tt, sl , *List_Fa_1, *List_Fa_2 , *Test_ori ;
 float   xc[10], yc[10], zc[10], angles[10], baryx=0., baryy=0., baryz=0. ;
 float   THETOL=0.0000000001 ;
 Tree_T  *Point_T , *Line_T , *Facet_T , *arXfa_T ;
@@ -75,12 +75,12 @@ void WritePoint(void *a, void *b)
 {
   struct Point *p ;
   p = (struct Point *) a ;
-  fprintf(outfile, "%d %.6f %.6f %.6f\n", 
+  fprintf(outfile, "%d %.6f %.6f %.6f\n",
 	  new_num_pt[p->num], (p->x)-baryx, (p->y)-baryy, (p->z)-baryz) ;
 }
 
 struct Line {
-  int num, a, b ; 
+  int num, a, b ;
 } ;
 
 int fcmpLine (const void *a, const void *b)
@@ -130,7 +130,7 @@ void WriteLine(void *a, void *b)
 }
 
 struct  arXfa {
-  int num_ar, num_el[3] ; 
+  int num_ar, num_el[3] ;
 } ;
 
 int fcmparXfa (const void *a, const void *b)
@@ -190,12 +190,12 @@ void WriteFacet(void *a, void *b)
   } else {
   fprintf(outfile, "%d 3 99 0 4 %d %d %d %d\n",
 	  t->num+nb_l, new_num_pt[t->p[0]], new_num_pt[t->p[1]], new_num_pt[t->p[2]], new_num_pt[t->p[3]]) ;
- 
+
   }
 }
 
 // **********************************************************************************************
-void orienttri_3 ( int Edgs , int Tgl , int Tgll ) 
+void orienttri_3 ( int Edgs , int Tgl , int Tgll )
 {
   struct Facet tri_0 , *tri_a , *tri_b ;
   int ii , mm  , numa , numb ;
@@ -230,9 +230,9 @@ void orienttri_2 (int N1 )
     Tgl=List_Fa_1[I-1];
     tri_0.num = Tgl ;
     tri_a = (struct Facet*)Tree_PQuery(Facet_T, &tri_0) ;
-    nbar = tri_a->nbar ; 
+    nbar = tri_a->nbar ;
     for (IEdgs=1 ; IEdgs <=nbar ; IEdgs++) { // pour chaque arete de la face
-      Edgs = tri_a->ar[IEdgs-1] ; 
+      Edgs = tri_a->ar[IEdgs-1] ;
       arXfa_0.num_ar = Edgs ;
       arXfa_b = (struct arXfa*)Tree_PQuery(arXfa_T, &arXfa_0) ;
       for (Mult=1 ; Mult<=3 ; Mult++) { // pour 3 faces possibles ayant cette arete
@@ -241,14 +241,14 @@ void orienttri_2 (int N1 )
 	  //printf("Tgll  %d  Test_ori[Tgll-1]  %d\n",Tgll,Test_ori[Tgll-1]);
 	  N2 = N2+1 ;
 	  List_Fa_2[N2-1] = Tgll ;
-	  orienttri_3( Edgs , Tgl , Tgll ) ; 
+	  orienttri_3( Edgs , Tgl , Tgll ) ;
 	  Test_ori[Tgll-1] = 1 ;
 	}
       }
     }
   }
   for ( I=1 ; I<=N2 ; I++ ) {
-    List_Fa_1[I-1] = List_Fa_2[I-1] ; 
+    List_Fa_1[I-1] = List_Fa_2[I-1] ;
   }
   N1 = N2 ;
   //if (N2!=0) printf("Longueur List_Fa2 = %d \n",N2) ;
@@ -265,14 +265,14 @@ void orienttri_1 (void )
   }
   N1 = 1 ;
   List_Fa_1[1-1] = 1 ;
-  Test_ori[1-1] = 1 ; 
+  Test_ori[1-1] = 1 ;
   orienttri_2(N1) ;
   for ( ii=2 ; ii<=nb_tt ; ii++ ) {
     if ( Test_ori[ii-1] == 0 ) {
       //printf("!!! Warning : Facet number %d not previously reached. New independent surface ?\n",ii);
-      N1 = 1 ; 
+      N1 = 1 ;
       List_Fa_1[1-1] = ii ;
-      Test_ori[ii-1] = 1 ; 
+      Test_ori[ii-1] = 1 ;
       orienttri_2(N1) ;
     }
   }
@@ -284,13 +284,13 @@ void orienttri_1 (void )
 
 
 void Addobj(void) /* dump out current object we should have all info on */
-{ 
-  struct Point      p ; 
+{
+  struct Point      p ;
   struct Line       l ;
   struct Facet      t ;
   struct arXfa      arXfa_cur ;
   int   ii , nump[4] , numl[4] , sel[4] ;
-  float det[4] ; 
+  float det[4] ;
 
   if (strstr(curobj, "POINT")){
     p.x = xc[0] ; p.y = yc[0] ; p.z = zc[0] ; AddPoint(&p) ;
@@ -300,17 +300,17 @@ void Addobj(void) /* dump out current object we should have all info on */
     if (xc[0]==xc[1] && yc[0]==yc[1] && zc[0]==zc[1]) {
       printf("!!! Warning : zero-length line in (3D)LINE removed !!!\n") ;
       return;
-    } 
+    }
     p.x = xc[0] ; p.y = yc[0] ; p.z = zc[0] ; nump[0] = AddPoint(&p) ;
     p.x = xc[1] ; p.y = yc[1] ; p.z = zc[1] ; nump[1] = AddPoint(&p) ;
     l.a = nump[0] ; l.b = nump[1] ; AddLine(&l) ;
 
-  } else if (strstr(curobj, "3DFACE")){ 
+  } else if (strstr(curobj, "3DFACE")){
 
-    det[0] =    (((yc[1]-yc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(yc[2]-yc[0]))) ; 
-    det[1] = -1*(((xc[1]-xc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(xc[2]-xc[0]))) ; 
-    det[2] =    (((xc[1]-xc[0])*(yc[2]-yc[0]))-((yc[1]-yc[0])*(xc[2]-xc[0]))) ; 
-    det[3] = sqrt ( det[0]*det[0]+det[1]*det[1]+det[2]*det[2] ) ; 
+    det[0] =    (((yc[1]-yc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(yc[2]-yc[0]))) ;
+    det[1] = -1*(((xc[1]-xc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(xc[2]-xc[0]))) ;
+    det[2] =    (((xc[1]-xc[0])*(yc[2]-yc[0]))-((yc[1]-yc[0])*(xc[2]-xc[0]))) ;
+    det[3] = sqrt ( det[0]*det[0]+det[1]*det[1]+det[2]*det[2] ) ;
    if (xc[3] == xc[2] && yc[3] == yc[2] && zc[3] == zc[2]) {
       if ( det[3] == 0. ) {
 	printf("!!! WARNING : Degenerate triangular 3DFACE (colinear points) removed !!!\n") ;
@@ -320,12 +320,12 @@ void Addobj(void) /* dump out current object we should have all info on */
 
       if (xc[3] == xc[0] && yc[3] == yc[0] && zc[3] == zc[0]) {
 	printf("!!! WARNING : Degenerate quadrangular 3DFACE converted in triangle !!!\n") ;
-	xc[3] = xc[2] ; yc[3] = yc[2] ; zc[3] = zc[2] ; 
+	xc[3] = xc[2] ; yc[3] = yc[2] ; zc[3] = zc[2] ;
       }
     }
      for ( ii=0 ; ii<=2 ; ii++ ) {
       p.x = xc[ii] ; p.y = yc[ii] ; p.z = zc[ii] ; nump[ii] = AddPoint(&p) ;
-      t.no[ii] = det[ii]/det[3] ; 
+      t.no[ii] = det[ii]/det[3] ;
     }
     l.a = nump[0] ; l.b = nump[1] ; numl[0] = AddLine(&l) ; sel[0] = sl ;
     arXfa_cur.num_ar = numl[0] ; AddarXfa(&arXfa_cur) ;
@@ -333,30 +333,30 @@ void Addobj(void) /* dump out current object we should have all info on */
     arXfa_cur.num_ar = numl[1] ; AddarXfa(&arXfa_cur) ;
 
     if (xc[3] == xc[2] && yc[3] == yc[2] && zc[3] == zc[2]){
-      t.nbar = 3 ; 
+      t.nbar = 3 ;
       l.a = nump[2] ; l.b = nump[0] ; numl[2] = AddLine(&l) ; sel[2] = sl ;
       arXfa_cur.num_ar = numl[2] ; AddarXfa(&arXfa_cur) ;
       nump[3] = 0 ; numl[3] = 0 ; sel[3] = 0 ; // fausse 4eme arete
     } else {
       t.nbar = 4 ;
       p.x = xc[3] ; p.y = yc[3] ; p.z = zc[3] ; nump[3] = AddPoint(&p) ;
-      l.a = nump[2] ; l.b = nump[3] ; numl[2] = AddLine(&l) ; sel[2] = sl ; 
+      l.a = nump[2] ; l.b = nump[3] ; numl[2] = AddLine(&l) ; sel[2] = sl ;
       arXfa_cur.num_ar = numl[2] ; AddarXfa(&arXfa_cur) ;
       l.a = nump[3] ; l.b = nump[0] ; numl[3] = AddLine(&l) ; sel[3] = sl ;
       arXfa_cur.num_ar = numl[3] ; AddarXfa(&arXfa_cur) ;
     }
     for ( ii=0 ; ii<=3 ; ii++ ) {
-      t.ar[ii] = numl[ii] ; 
+      t.ar[ii] = numl[ii] ;
       t.s[ii] = sel[ii] ;
       t.p[ii] = nump[ii] ;
     }
-    t.ori = 1 ; 
+    t.ori = 1 ;
     AddFacet(&t) ;
   }
 }
 
 int getline(void) /* read a group code and the next line from infile */
-{ 
+{
   fgets(linbuf, BUFSIZE, infile); /* get a line from .DXF */
   if (feof(infile))
     return(1);
@@ -377,8 +377,8 @@ int main(int argc, char *argv[])
     }
     THETOL = atof(argv[2]) ;
   */
-  printf("\nAutoCAD DXF to Emc2000Flash .Geom Data File Converter\n") ; 
-  printf("by David Colignon ( David.Colignon@AdValvas.be )\n\n") ; 
+  printf("\nAutoCAD DXF to Emc2000Flash .Geom Data File Converter\n") ;
+  printf("by David Colignon ( David.Colignon@AdValvas.be )\n\n") ;
 
   strcpy(inname, argv[1]); /* make copy we can mess with */
   if (!strchr(inname, '.')) /* no dot present in filename? */
@@ -403,8 +403,8 @@ int main(int argc, char *argv[])
   Line_T     = Tree_Create(sizeof(struct Line), fcmpLine) ;
   Facet_T   = Tree_Create(sizeof(struct Facet), fcmpFacet) ;
   arXfa_T    = Tree_Create(sizeof(struct arXfa), fcmparXfa) ;
-  
- find: 
+
+ find:
   while (!feof(infile)){ /* run file up to the "ENTITIES" section */
     if (getline()) goto stopit;
     if (groupcode == 0){ /* file section mark */
@@ -461,12 +461,12 @@ int main(int argc, char *argv[])
     }
   }
 
- stopit: 
+ stopit:
   fclose(infile);
 
   nb_p  = Tree_Nbr(Point_T) ;
   new_num_pt   = (int*) Malloc ( (nb_p+1) * sizeof(int) ) ;
-  baryx /= nb_p ; baryy /= nb_p ; baryz /= nb_p ; 
+  baryx /= nb_p ; baryy /= nb_p ; baryz /= nb_p ;
   nb_l  = Tree_Nbr(Line_T) ;
   new_num_l = (int*) Malloc ( (nb_l+1) * sizeof(int) ) ;
   nb_tt = Tree_Nbr(Facet_T) ;
@@ -504,4 +504,3 @@ int main(int argc, char *argv[])
   Free(new_num_l) ;
   exit(0);
 }
-
diff --git a/utils/converters/autocad/dxf2pos.c b/utils/converters/autocad/dxf2pos.c
index 5af66d2f01806f6d33aacdfa5d9690131fef36f0..c75c86ab7760170ec713613b19e32b5d7b625c4c 100644
--- a/utils/converters/autocad/dxf2pos.c
+++ b/utils/converters/autocad/dxf2pos.c
@@ -1,13 +1,13 @@
 /* $Id: dxf2pos.c,v 1.2 2007-09-04 13:47:07 remacle Exp $ */
 
-/* 
+/*
    AutoCAD DXF to GMSH .pos Data File Converter
 
    David.Colignon@AdValvas.be
-   
+
    This is a hack from the Autocad DXF to DKB .Data file translator Version 1.0
    written by Aaron A. Collins (8/13/90) ( http://www.sdsc.edu/~mjb/mae152/dxf.spec.txt )
-   and from dxf2geo by Christophe Geuzaine ( http://www.geuz.org/gmsh )
+   and from dxf2geo by Christophe Geuzaine ( http://www.gmsh.info )
 
 */
 
@@ -72,7 +72,7 @@ void RenumPoint(void *a, void *b)
 }
 
 struct Line {
-  int num, a, b ; 
+  int num, a, b ;
 } ;
 
 int fcmpLine (const void *a, const void *b)
@@ -114,7 +114,7 @@ void RenumLine(void *a, void *b)
 }
 
 struct arXfa {
-  int num_ar, num_el[3] ; 
+  int num_ar, num_el[3] ;
 } ;
 
 int fcmparXfa (const void *a, const void *b)
@@ -177,7 +177,7 @@ void WriteFacet_tri(void *a, void *b)
     fprintf(outfile, "%f %f %f \n", tt->z[0], tt->z[1], tt->z[2]);
     fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
     fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
-    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));    
+    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
   }
 }
 
@@ -194,12 +194,12 @@ void WriteFacet_qua(void *a, void *b)
     fprintf(outfile, "%f %f %f %f\n", tt->z[0], tt->z[1], tt->z[2], tt->z[3]);
     fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
     fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
-    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));    
-    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));    
+    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
+    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
   }
 }
 
-void orienttri_3 ( int Edgs , int Tgl , int Tgll ) 
+void orienttri_3 ( int Edgs , int Tgl , int Tgll )
 {
   struct Facet tri_0 , *tri_a , *tri_b ;
   int ii , mm  , numa , numb ;
@@ -232,24 +232,24 @@ void orienttri_2 (int N1 )
       Tgl=List_Fa_1[I-1];
       tri_0.num = Tgl ;
       tri_a = (struct Facet*)Tree_PQuery(Facet_T, &tri_0) ;
-      nbar = tri_a->nbar ; 
-      for (IEdgs=1 ; IEdgs <=nbar ; IEdgs++) { 
-	  Edgs = tri_a->ar[IEdgs-1] ; 
+      nbar = tri_a->nbar ;
+      for (IEdgs=1 ; IEdgs <=nbar ; IEdgs++) {
+	  Edgs = tri_a->ar[IEdgs-1] ;
 	  arXfa_0.num_ar = Edgs ;
 	  arXfa_b = (struct arXfa*)Tree_PQuery(arXfa_T, &arXfa_0) ;
-	  for (Mult=1 ; Mult<=3 ; Mult++) { 
+	  for (Mult=1 ; Mult<=3 ; Mult++) {
 	      Tgll = arXfa_b->num_el[Mult-1] ;
 	      if ( (Tgll!=0) && (Test_ori[Tgll-1] == 0) ) {
 		  N2 = N2+1 ;
 		  List_Fa_2[N2-1] = Tgll ;
-		  orienttri_3( Edgs , Tgl , Tgll ) ; 
+		  orienttri_3( Edgs , Tgl , Tgll ) ;
 		  Test_ori[Tgll-1] = 1 ;
 	      }
 	  }
       }
   }
   for ( I=1 ; I<=N2 ; I++ ) {
-      List_Fa_1[I-1] = List_Fa_2[I-1] ; 
+      List_Fa_1[I-1] = List_Fa_2[I-1] ;
   }
   N1 = N2 ;
   if (N1!=0) goto flag1 ;
@@ -265,13 +265,13 @@ void orienttri_1 (void )
   }
   N1 = 1 ;
   List_Fa_1[1-1] = 1 ;
-  Test_ori[1-1] = 1 ; 
+  Test_ori[1-1] = 1 ;
   orienttri_2(N1) ;
   for ( ii=2 ; ii<=nb_tt ; ii++ ) {
     if ( Test_ori[ii-1] == 0 ) {
-      N1 = 1 ; 
+      N1 = 1 ;
       List_Fa_1[1-1] = ii ;
-      Test_ori[ii-1] = 1 ; 
+      Test_ori[ii-1] = 1 ;
       orienttri_2(N1) ;
     }
   }
@@ -279,13 +279,13 @@ void orienttri_1 (void )
 }
 
 void Addobj(void)
-{ 
-  struct Point      p ; 
+{
+  struct Point      p ;
   struct Line       l ;
   struct Facet   t ;
   struct arXfa      arXfa_cur ;
   int   ii , nump[4] , numl[4] , sel[4] ;
-  float det[4] ; 
+  float det[4] ;
 
   if (strstr(curobj, "POINT")){
     p.x = xc[0] ; p.y = yc[0] ; p.z = zc[0] ; AddPoint(&p) ;
@@ -300,12 +300,12 @@ void Addobj(void)
     p.x = xc[1] ; p.y = yc[1] ; p.z = zc[1] ; nump[1] = AddPoint(&p) ;
     l.a = nump[0] ; l.b = nump[1] ; AddLine(&l) ;
 
-  } else if (strstr(curobj, "3DFACE")){ 
+  } else if (strstr(curobj, "3DFACE")){
 
-    det[0] =    (((yc[1]-yc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(yc[2]-yc[0]))) ; 
-    det[1] = -1*(((xc[1]-xc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(xc[2]-xc[0]))) ; 
-    det[2] =    (((xc[1]-xc[0])*(yc[2]-yc[0]))-((yc[1]-yc[0])*(xc[2]-xc[0]))) ; 
-    det[3] = sqrt ( det[0]*det[0]+det[1]*det[1]+det[2]*det[2] ) ; 
+    det[0] =    (((yc[1]-yc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(yc[2]-yc[0]))) ;
+    det[1] = -1*(((xc[1]-xc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(xc[2]-xc[0]))) ;
+    det[2] =    (((xc[1]-xc[0])*(yc[2]-yc[0]))-((yc[1]-yc[0])*(xc[2]-xc[0]))) ;
+    det[3] = sqrt ( det[0]*det[0]+det[1]*det[1]+det[2]*det[2] ) ;
 
    if (xc[3] == xc[2] && yc[3] == yc[2] && zc[3] == zc[2]) {
       if ( det[3] == 0. ) {
@@ -316,12 +316,12 @@ void Addobj(void)
 
       if (xc[3] == xc[0] && yc[3] == yc[0] && zc[3] == zc[0]) {
 	printf("!!! WARNING : Degenerate quadrangular 3DFACE converted in triangle !!!\n") ;
-	xc[3] = xc[2] ; yc[3] = yc[2] ; zc[3] = zc[2] ; 
+	xc[3] = xc[2] ; yc[3] = yc[2] ; zc[3] = zc[2] ;
       }
     }
     for ( ii=0 ; ii<=2 ; ii++ ) {
       p.x = xc[ii] ; p.y = yc[ii] ; p.z = zc[ii] ; nump[ii] = AddPoint(&p) ;
-      t.no[ii] = det[ii]/det[3] ; 
+      t.no[ii] = det[ii]/det[3] ;
     }
     l.a = nump[0] ; l.b = nump[1] ; numl[0] = AddLine(&l) ; sel[0] = sl ;
     arXfa_cur.num_ar = numl[0] ; AddarXfa(&arXfa_cur) ;
@@ -344,17 +344,17 @@ void Addobj(void)
       arXfa_cur.num_ar = numl[3] ; AddarXfa(&arXfa_cur) ;
     }
     for ( ii=0 ; ii<=3 ; ii++ ) {
-      t.ar[ii] = numl[ii] ; 
+      t.ar[ii] = numl[ii] ;
       t.s[ii] = sel[ii] ;
-      t.x[ii] = xc[ii] ; t.y[ii] = yc[ii] ; t.z[ii] = zc[ii] ; 
+      t.x[ii] = xc[ii] ; t.y[ii] = yc[ii] ; t.z[ii] = zc[ii] ;
     }
-    t.ori = 1 ; 
+    t.ori = 1 ;
     AddFacet(&t) ;
   }
 }
 
 int getline(void)
-{ 
+{
   fgets(linbuf, BUFSIZE, infile); /* get a line from .DXF */
   if (feof(infile))
     return(1);
@@ -375,8 +375,8 @@ int main(int argc, char *argv[])
     }
     THETOL = atof(argv[2]) ;
   */
-  printf("\nAutoCAD DXF to Emc2000Flash .Geom Data File Converter\n") ; 
-  printf("by David Colignon ( David.Colignon@AdValvas.be )\n\n") ; 
+  printf("\nAutoCAD DXF to Emc2000Flash .Geom Data File Converter\n") ;
+  printf("by David Colignon ( David.Colignon@AdValvas.be )\n\n") ;
 
   strcpy(inname, argv[1]); /* make copy we can mess with */
   if (!strchr(inname, '.')) /* no dot present in filename? */
@@ -401,8 +401,8 @@ int main(int argc, char *argv[])
   Line_T     = Tree_Create(sizeof(struct Line), fcmpLine) ;
   Facet_T   = Tree_Create(sizeof(struct Facet), fcmpFacet) ;
   arXfa_T    = Tree_Create(sizeof(struct arXfa), fcmparXfa) ;
-  
- find: 
+
+ find:
   while (!feof(infile)){ /* run file up to the "ENTITIES" section */
     if (getline()) goto stopit;
     if (groupcode == 0){ /* file section mark */
@@ -459,12 +459,12 @@ int main(int argc, char *argv[])
     }
   }
 
- stopit: 
+ stopit:
   fclose(infile);
 
   nb_p  = Tree_Nbr(Point_T) ;
   new_num_pt   = (int*) Malloc ( (nb_p+1) * sizeof(int) ) ;
-  baryx /= nb_p ; baryy /= nb_p ; baryz /= nb_p ; 
+  baryx /= nb_p ; baryy /= nb_p ; baryz /= nb_p ;
   nb_l  = Tree_Nbr(Line_T) ;
   new_num_l = (int*) Malloc ( (nb_l+1) * sizeof(int) ) ;
   nb_tt = Tree_Nbr(Facet_T) ;
diff --git a/utils/misc/find_missing_copyright.sh b/utils/misc/find_missing_copyright.sh
index 023e9a57889b41b7711de6b136c84fea04d0a161..b1c2f120ddfc474c482aebac3ae2c5ed6d80325c 100755
--- a/utils/misc/find_missing_copyright.sh
+++ b/utils/misc/find_missing_copyright.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-find . -type f ! -exec grep -q 'Copyright' {} \; -print
+find ../.. -not -path "*.svn*" -and -type f ! -exec grep -q 'Copyright' {} \; -print
diff --git a/utils/nightly/gmsh.ctest b/utils/nightly/gmsh.ctest
index 2e0ff81c902ad43a52c9d78b44c2e1a26832e625..07d09cf533f239243b405edbe708618218926cab 100644
--- a/utils/nightly/gmsh.ctest
+++ b/utils/nightly/gmsh.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 # this is the common ctest script used by all gmsh nightly (and experimental)
 # builds, on all architectures
@@ -23,7 +23,7 @@ else(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
 endif(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
 
 set(CTEST_SOURCE_DIRECTORY "$ENV{HOME}/src/gmsh")
-set(CTEST_SVN_REPOS https://geuz.org/svn/gmsh/trunk)
+set(CTEST_SVN_REPOS https://onelab.info/svn/gmsh/trunk)
 
 if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
   set(CTEST_CHECKOUT_COMMAND 
diff --git a/utils/nightly/gmsh_linux32.ctest b/utils/nightly/gmsh_linux32.ctest
index 7268afdc7fb0792366a8efac5b60477e3a0031cc..3c76230b293f0e68ba1c4f0dee20d346e12fdb49 100644
--- a/utils/nightly/gmsh_linux32.ctest
+++ b/utils/nightly/gmsh_linux32.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Linux")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Linux")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_linux32_nightly.ctest b/utils/nightly/gmsh_linux32_nightly.ctest
index 69271d3a12063aa960e6400c4ef264e338357491..920e76d1131e6308d811b2dcc3532581166dbc2e 100644
--- a/utils/nightly/gmsh_linux32_nightly.ctest
+++ b/utils/nightly/gmsh_linux32_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_linux32_test.ctest b/utils/nightly/gmsh_linux32_test.ctest
index 317d4937bfbedbd2862171eaca246c1ecbccd9fe..b584883134dc7d2bc794b157d22fec21c692521c 100644
--- a/utils/nightly/gmsh_linux32_test.ctest
+++ b/utils/nightly/gmsh_linux32_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_linux32.ctest)
diff --git a/utils/nightly/gmsh_linux64.ctest b/utils/nightly/gmsh_linux64.ctest
index 7bec7203f9109c931147f0b3295cc18daa21e606..c5d0f379779f261943aede2045588ce3c3244a12 100644
--- a/utils/nightly/gmsh_linux64.ctest
+++ b/utils/nightly/gmsh_linux64.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Linux")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Linux")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_linux64_coverage.ctest b/utils/nightly/gmsh_linux64_coverage.ctest
index 2b3a9ab52d37b6594820e9bac8a48983034a6d43..ce4e81eb660ea943bcdf5231adbd024279466c0a 100644
--- a/utils/nightly/gmsh_linux64_coverage.ctest
+++ b/utils/nightly/gmsh_linux64_coverage.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
diff --git a/utils/nightly/gmsh_linux64_nightly.ctest b/utils/nightly/gmsh_linux64_nightly.ctest
index 3c0f38874a086c3bef5568ff7c73d192d5e130d4..e634d34444d5a2dbc01e5ad414e888513c8812ae 100644
--- a/utils/nightly/gmsh_linux64_nightly.ctest
+++ b/utils/nightly/gmsh_linux64_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_linux64_test.ctest b/utils/nightly/gmsh_linux64_test.ctest
index aa335558343dedbe2f7cce06d0abb7037cd54b11..64817990fdec60c014d55f419c1bd8f800785548 100644
--- a/utils/nightly/gmsh_linux64_test.ctest
+++ b/utils/nightly/gmsh_linux64_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_linux64.ctest)
diff --git a/utils/nightly/gmsh_mac.ctest b/utils/nightly/gmsh_mac.ctest
index e07bc610b98b8f492dc4f41f1a964a8e8afdada1..f514215c2daeccd4a3b7ef9c100c75e3be107daa 100644
--- a/utils/nightly/gmsh_mac.ctest
+++ b/utils/nightly/gmsh_mac.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "/usr/local/bin/cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/MacOSX")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/MacOSX")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_mac_nightly.ctest b/utils/nightly/gmsh_mac_nightly.ctest
index a37714690aa2efd713fbc2e6e7d49934c8f58380..c1ccbc893eabea9c859b185d29bdad80ce6a19f5 100644
--- a/utils/nightly/gmsh_mac_nightly.ctest
+++ b/utils/nightly/gmsh_mac_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_mac_test.ctest b/utils/nightly/gmsh_mac_test.ctest
index 7e569c1694e566069a687f029c348b855da89b75..803975ca490f7bea2e48d849ecc695a65ce0f0e4 100644
--- a/utils/nightly/gmsh_mac_test.ctest
+++ b/utils/nightly/gmsh_mac_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_mac.ctest)
diff --git a/utils/nightly/gmsh_msvc.ctest b/utils/nightly/gmsh_msvc.ctest
index 90794304aa67c0b5752d05d3634f72bde19e67f8..c268c3b469485ca58392120a0085c26309cc9291 100644
--- a/utils/nightly/gmsh_msvc.ctest
+++ b/utils/nightly/gmsh_msvc.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "C:/Program Files (x86)/CMake 2.8/bin/cmake.exe")
 set(CTEST_CMAKE_GENERATOR "Visual Studio 11")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Windows")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Windows")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_msvc_nightly.ctest b/utils/nightly/gmsh_msvc_nightly.ctest
index 3df991fbc9a7e917c35c0150ef73e2451613d1f0..845d2cc4e0f7a5d9034a2989f7d9b7015ec68580 100644
--- a/utils/nightly/gmsh_msvc_nightly.ctest
+++ b/utils/nightly/gmsh_msvc_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_win32.ctest b/utils/nightly/gmsh_win32.ctest
index 959d1cccfc8a0fbe277a27cb596c2b6fd0f3b738..e00b383b51f258b9f0e08eda07dc4cb2949f9a48 100644
--- a/utils/nightly/gmsh_win32.ctest
+++ b/utils/nightly/gmsh_win32.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Windows")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Windows")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_win32_nightly.ctest b/utils/nightly/gmsh_win32_nightly.ctest
index 70802264746f535c586ab61b503229dd9f8156b1..742636cbbda08e7576fd52bf4771bc45f167c2ee 100644
--- a/utils/nightly/gmsh_win32_nightly.ctest
+++ b/utils/nightly/gmsh_win32_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_win32_test.ctest b/utils/nightly/gmsh_win32_test.ctest
index 1236a5c80b1c8a4e67f7b315e805cd427116be4d..aee0f7b9e2d122765f968c152b293b9691f47d68 100644
--- a/utils/nightly/gmsh_win32_test.ctest
+++ b/utils/nightly/gmsh_win32_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_win32.ctest)
diff --git a/utils/nightly/gmsh_win64.ctest b/utils/nightly/gmsh_win64.ctest
index 5a784e4de537b51a5d8e1f052eb23c6920eead3e..155e92ecbd13c6c46d08a7d2810c92334dbb1740 100644
--- a/utils/nightly/gmsh_win64.ctest
+++ b/utils/nightly/gmsh_win64.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Windows")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Windows")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_win64_nightly.ctest b/utils/nightly/gmsh_win64_nightly.ctest
index ec887bbf19339646505437415f29c21037b56cb5..5813f7385fd123a6664b516b2236f4028406547c 100644
--- a/utils/nightly/gmsh_win64_nightly.ctest
+++ b/utils/nightly/gmsh_win64_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_win64_test.ctest b/utils/nightly/gmsh_win64_test.ctest
index 09a984828983dc7cf71996c6a4c354c5a47d7b1c..0530f60dd1e7e9b0042453783e91c5eedb8e0551 100644
--- a/utils/nightly/gmsh_win64_test.ctest
+++ b/utils/nightly/gmsh_win64_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_win64.ctest)
diff --git a/utils/solvers/c++/GmshSocket.h b/utils/solvers/c++/GmshSocket.h
index cfac85614d009b2c0bb10138fbe35169cc3ddcbf..42664f85263cbdd70bf3c5e8a52112edf4ee746a 100644
--- a/utils/solvers/c++/GmshSocket.h
+++ b/utils/solvers/c++/GmshSocket.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _GMSH_SOCKET_H_
 #define _GMSH_SOCKET_H_
diff --git a/utils/solvers/c++/onelab.h b/utils/solvers/c++/onelab.h
index fafc38a39c52457f06a5e7c5d8233b9274f5f988..e5c92260a3d86cd5fd524485551b3858d9195e93 100644
--- a/utils/solvers/c++/onelab.h
+++ b/utils/solvers/c++/onelab.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _ONELAB_H_
 #define _ONELAB_H_
diff --git a/wrappers/gmshpy/CMakeLists.txt b/wrappers/gmshpy/CMakeLists.txt
index f42b5a4ea83742021be6b6d65e66aacc3fb033fe..b9f10c2a851754934b216abe05fd4ab1bcc77fd2 100644
--- a/wrappers/gmshpy/CMakeLists.txt
+++ b/wrappers/gmshpy/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SWIG_MODULES
   gmshCommon