diff --git a/src/adjmat/AdjacencyMatrixBase.cpp b/src/adjmat/AdjacencyMatrixBase.cpp
index 9f6cc8de7d18d9bb445c08e071e6d07c8c2811b9..41fbef64dbcfdb50252bc1cbcd3f6d1ae9d4604d 100644
--- a/src/adjmat/AdjacencyMatrixBase.cpp
+++ b/src/adjmat/AdjacencyMatrixBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/AdjacencyMatrixBase.h b/src/adjmat/AdjacencyMatrixBase.h
index c9b44d2455fcb6527a2a233170043196e4c5458b..b407cdce1204968391665cef47fd7b4896845ef7 100644
--- a/src/adjmat/AdjacencyMatrixBase.h
+++ b/src/adjmat/AdjacencyMatrixBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/AdjacencyMatrixVessel.cpp b/src/adjmat/AdjacencyMatrixVessel.cpp
index f4a62bb6db7260d16228c482f6c1f103d55ab2ad..65dfeb0adba27afacbce2179c34cc7ce1c896290 100644
--- a/src/adjmat/AdjacencyMatrixVessel.cpp
+++ b/src/adjmat/AdjacencyMatrixVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/AdjacencyMatrixVessel.h b/src/adjmat/AdjacencyMatrixVessel.h
index 7e1ef1586c85c8a921509e7f19f87633f127e788..11d172b81fcb3f22c40ffd2314b01b8400fbce9b 100644
--- a/src/adjmat/AdjacencyMatrixVessel.h
+++ b/src/adjmat/AdjacencyMatrixVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/AlignedMatrixBase.cpp b/src/adjmat/AlignedMatrixBase.cpp
index 408cf8c7366936ad8012ab86b603598ec281564d..93d923d6862fe0225c8ad9190af3b048a1c446d3 100644
--- a/src/adjmat/AlignedMatrixBase.cpp
+++ b/src/adjmat/AlignedMatrixBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ClusterAnalysisBase.cpp b/src/adjmat/ClusterAnalysisBase.cpp
index ee6c743064ea6174664557ce277fd3beb01dd2e2..0ed5451fba7a40d59e0ac12121a42c6ec177f134 100644
--- a/src/adjmat/ClusterAnalysisBase.cpp
+++ b/src/adjmat/ClusterAnalysisBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ClusterAnalysisBase.h b/src/adjmat/ClusterAnalysisBase.h
index 24a1b80aee05302ec44a5ac4c72aa49a71654dda..287e11816d031ad4c1eb592bd3e1bbe13132d4ea 100644
--- a/src/adjmat/ClusterAnalysisBase.h
+++ b/src/adjmat/ClusterAnalysisBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ClusterDiameter.cpp b/src/adjmat/ClusterDiameter.cpp
index 8bebeab9289b82087748d6ba2ac6969087fe7d69..f3b572fea7de37d472c7f19cccfb14cb69750906 100644
--- a/src/adjmat/ClusterDiameter.cpp
+++ b/src/adjmat/ClusterDiameter.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ClusterDistribution.cpp b/src/adjmat/ClusterDistribution.cpp
index afd7c956e523eb39e4120713f722c3d9fbf76e5e..5f75ed633201e599d2622f25dbe9bb93481f51fd 100644
--- a/src/adjmat/ClusterDistribution.cpp
+++ b/src/adjmat/ClusterDistribution.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ClusterProperties.cpp b/src/adjmat/ClusterProperties.cpp
index b1d891fe06f55fc5acdfc63ac8fd617d14c13e25..7c618fb992103ff03e9e2b0a81d77a41453f14e9 100644
--- a/src/adjmat/ClusterProperties.cpp
+++ b/src/adjmat/ClusterProperties.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ClusterSize.cpp b/src/adjmat/ClusterSize.cpp
index 4ae18bb491060052ff566ff3a686c16f9ef0dda4..f40735f01f1f7273115898bbc583119289aad5ed 100644
--- a/src/adjmat/ClusterSize.cpp
+++ b/src/adjmat/ClusterSize.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ClusterWithSurface.cpp b/src/adjmat/ClusterWithSurface.cpp
index 1042accd051e4c0e25008f9df7fa580bc101cbfe..d19431d98716c1073146ae03942a486db82db3fe 100644
--- a/src/adjmat/ClusterWithSurface.cpp
+++ b/src/adjmat/ClusterWithSurface.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ClusteringBase.cpp b/src/adjmat/ClusteringBase.cpp
index 8e21ee16f57d040163bcec1826282ba0c2a44c96..c289e9cd9d846590ec04380f893c266e96f65c45 100644
--- a/src/adjmat/ClusteringBase.cpp
+++ b/src/adjmat/ClusteringBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ClusteringBase.h b/src/adjmat/ClusteringBase.h
index 741ac9046ef6f62eb6967bb8fe91f05a0d854a04..9d9aa88fcd6b8fdfa10818aceb8e87dc8138ac77 100644
--- a/src/adjmat/ClusteringBase.h
+++ b/src/adjmat/ClusteringBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ContactAlignedMatrix.cpp b/src/adjmat/ContactAlignedMatrix.cpp
index d00542aea1abc7d94123f9f4ee2c4173bf70adef..60cdb7221177f135c6661668883bfe70b68d3b00 100644
--- a/src/adjmat/ContactAlignedMatrix.cpp
+++ b/src/adjmat/ContactAlignedMatrix.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/ContactMatrix.cpp b/src/adjmat/ContactMatrix.cpp
index e1a332a2af9a21f8ac2b7f703c27ea450ad9dcfc..9b945c602f694cca7836b379a1ee642610634535 100644
--- a/src/adjmat/ContactMatrix.cpp
+++ b/src/adjmat/ContactMatrix.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/DFSClustering.cpp b/src/adjmat/DFSClustering.cpp
index 23bf5c592caafc058baef4ba28a3bb17303c9ed2..f13769eeae2a8f73dbbc2353371bdb6d190a1904 100644
--- a/src/adjmat/DFSClustering.cpp
+++ b/src/adjmat/DFSClustering.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/HbondMatrix.cpp b/src/adjmat/HbondMatrix.cpp
index 32e7989deee60972a4cad90ffe7008730109226f..a8e0f04aec1202a45d448167017ae62c6526ac33 100644
--- a/src/adjmat/HbondMatrix.cpp
+++ b/src/adjmat/HbondMatrix.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/MatrixColumnSums.cpp b/src/adjmat/MatrixColumnSums.cpp
index cae24fcec899d62d88cc879ead801480d41a35a5..a456b974289492e8266f7a7cdbc602c146a56d5e 100644
--- a/src/adjmat/MatrixColumnSums.cpp
+++ b/src/adjmat/MatrixColumnSums.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/MatrixRowSums.cpp b/src/adjmat/MatrixRowSums.cpp
index 6ef15fb282c0ddabd29136e1a6ed55ba668e1cfd..39f00c6db44368eb63b48d99cc5438b14475b2e3 100644
--- a/src/adjmat/MatrixRowSums.cpp
+++ b/src/adjmat/MatrixRowSums.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/OutputCluster.cpp b/src/adjmat/OutputCluster.cpp
index 4dd430f3c71befba4c75b6a443e61b1698ab1ddc..8b7f2a0e76dfde5f8719adf43212c1f948395430 100644
--- a/src/adjmat/OutputCluster.cpp
+++ b/src/adjmat/OutputCluster.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/adjmat/Sprint.cpp b/src/adjmat/Sprint.cpp
index 3e90100e8e2d6c139b559a220e0edcb3d04e996e..8a4c1fe58bc9018b77db93fd5e7f392e38743f3c 100644
--- a/src/adjmat/Sprint.cpp
+++ b/src/adjmat/Sprint.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/Analysis.cpp b/src/analysis/Analysis.cpp
index 989981ab6beb278cd7ec640361e5a254eb0b8761..5901ca76242609dde848137197d71d7e46a153e3 100644
--- a/src/analysis/Analysis.cpp
+++ b/src/analysis/Analysis.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/Analysis.h b/src/analysis/Analysis.h
index 44b6082777dc5cc889710e025d6d0ef04196075b..206091148488ed78fba1d4db34e8635241fa0f60 100644
--- a/src/analysis/Analysis.h
+++ b/src/analysis/Analysis.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/AnalysisWithLandmarks.cpp b/src/analysis/AnalysisWithLandmarks.cpp
index 9cd67c52f497e1734e1fcc171fbe75950134b781..7302d5152d4d782964085290001a93da4570dbea 100644
--- a/src/analysis/AnalysisWithLandmarks.cpp
+++ b/src/analysis/AnalysisWithLandmarks.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/AnalysisWithLandmarks.h b/src/analysis/AnalysisWithLandmarks.h
index b129a4d01edf881a5af4a2f81886d3e82d62fdd0..ebc99b9cd115899accda54dfccc8f55c49436e33 100644
--- a/src/analysis/AnalysisWithLandmarks.h
+++ b/src/analysis/AnalysisWithLandmarks.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/Average.cpp b/src/analysis/Average.cpp
index 9d0566da8e2a35c13cecdf769dfabab45e009741..da14b084399b2637ce2242d1d887b03caed89fdf 100644
--- a/src/analysis/Average.cpp
+++ b/src/analysis/Average.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/AverageVessel.cpp b/src/analysis/AverageVessel.cpp
index 96e4a72fe0644064962bc268505bc3821c8c4710..5c7646769be23ae647739381edc23e62de033b63 100644
--- a/src/analysis/AverageVessel.cpp
+++ b/src/analysis/AverageVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/AverageVessel.h b/src/analysis/AverageVessel.h
index 3b056b8c4882ac0810832f16c834f4c914087434..05eea9d5443a168508944b79c8c0ad48b2bf7f2a 100644
--- a/src/analysis/AverageVessel.h
+++ b/src/analysis/AverageVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/ClassicalMultiDimensionalScaling.cpp b/src/analysis/ClassicalMultiDimensionalScaling.cpp
index 68ac6aeae304c4b06b38f5878d816ce4100fe3bf..5862c17ba2241c7c1cb55a894615a8e57069eab5 100644
--- a/src/analysis/ClassicalMultiDimensionalScaling.cpp
+++ b/src/analysis/ClassicalMultiDimensionalScaling.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/ClassicalScaling.cpp b/src/analysis/ClassicalScaling.cpp
index e7c911eeef2cc8dfbd364a907a6da47fb499d859..a80883a9f3ac3d8fe9e634e96bb38bf0971f6a66 100644
--- a/src/analysis/ClassicalScaling.cpp
+++ b/src/analysis/ClassicalScaling.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/Commit.cpp b/src/analysis/Committor.cpp
similarity index 99%
rename from src/analysis/Commit.cpp
rename to src/analysis/Committor.cpp
index d51d6b9e55f12af1600b6da880657438f589c341..870fb91f7766c86b57be68a9c4186e4f14c7a511 100644
--- a/src/analysis/Commit.cpp
+++ b/src/analysis/Committor.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/LandmarkRegister.h b/src/analysis/LandmarkRegister.h
index dd4c5d38d946c71f88f62f2528642ced06793c1d..fa54680f20ce3d6e500631bff6ef6ab051c69be8 100644
--- a/src/analysis/LandmarkRegister.h
+++ b/src/analysis/LandmarkRegister.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/LandmarkSelectionBase.cpp b/src/analysis/LandmarkSelectionBase.cpp
index 5bd8f7e60f147c741132b80b5c789b0aa7d3a3bc..7602b9bc77abe6c32ab96b9de4aa044fd1d0ee16 100644
--- a/src/analysis/LandmarkSelectionBase.cpp
+++ b/src/analysis/LandmarkSelectionBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/LandmarkSelectionBase.h b/src/analysis/LandmarkSelectionBase.h
index a8300ff10707ec8a0b7bf8fea0b98aa2cd2d9af2..2eea0c3565d48a2b119be99e8bb62048ab9d5283 100644
--- a/src/analysis/LandmarkSelectionBase.h
+++ b/src/analysis/LandmarkSelectionBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/analysis/SelectAllFrames.cpp b/src/analysis/SelectAllFrames.cpp
index 8f61b7305d4bd5dee9f3e2235f7f03f7e12324f7..2190a5603fc3ea561410433343bd900f60cac203 100644
--- a/src/analysis/SelectAllFrames.cpp
+++ b/src/analysis/SelectAllFrames.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/ABMD.cpp b/src/bias/ABMD.cpp
index a76c5341c3b983cde34534ea31f8c57d18949113..602163ebae5a02875480cdd45b6f79e5c3f7ffc8 100644
--- a/src/bias/ABMD.cpp
+++ b/src/bias/ABMD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/Bias.cpp b/src/bias/Bias.cpp
index 4075e3433e8880c25ce21c617a19e1e5815b9958..4d5c9ba5efd6b23c37c5125af75f8049569c11d7 100644
--- a/src/bias/Bias.cpp
+++ b/src/bias/Bias.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/Bias.h b/src/bias/Bias.h
index 25776466f4a01d0615d1f36cc838ac3e6a380e23..776138e900490e75fd96e7237fb80fa1f0582b10 100644
--- a/src/bias/Bias.h
+++ b/src/bias/Bias.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/BiasValue.cpp b/src/bias/BiasValue.cpp
index ff741a6c0c5c3e0e7b9b265fe11664d6442a7d10..811b282d14bc81cc39ba2c544cde2a0b22efece5 100644
--- a/src/bias/BiasValue.cpp
+++ b/src/bias/BiasValue.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/ExtendedLagrangian.cpp b/src/bias/ExtendedLagrangian.cpp
index ee3d3ada041452f28b612d2295b363c18ec80eca..408e59ee08ceef63306f6afec193629c57743dce 100644
--- a/src/bias/ExtendedLagrangian.cpp
+++ b/src/bias/ExtendedLagrangian.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/External.cpp b/src/bias/External.cpp
index 7c714efae64d1c6568d29efa0e70b36fd7721353..2e62f77bf227e0cf6067cdf8879e7870bdef3485 100644
--- a/src/bias/External.cpp
+++ b/src/bias/External.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/LWalls.cpp b/src/bias/LWalls.cpp
index 26bb720f13ba11b7417230db587402eb8bc17e26..8785af9e31474f7a818edf9ed248c2542dd11a43 100644
--- a/src/bias/LWalls.cpp
+++ b/src/bias/LWalls.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/Metainference.cpp b/src/bias/Metainference.cpp
index 3953c436d1368922505817caa483ff033bc6ccb2..6cbebc605d5e77d90aa5da094cff8fe27e1f8248 100644
--- a/src/bias/Metainference.cpp
+++ b/src/bias/Metainference.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/MovingRestraint.cpp b/src/bias/MovingRestraint.cpp
index d5317af1d9abb8a0e4e0771eede4b68e49e3681e..af00e1efcee2f107c75a5d4f6340efd7bf045883 100644
--- a/src/bias/MovingRestraint.cpp
+++ b/src/bias/MovingRestraint.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/Restraint.cpp b/src/bias/Restraint.cpp
index 85208d35ba1ad62377bcbf09bc662fb088261f1e..4ab187ec8de51b6843a4d8f8c16a6f1ab3be1e23 100644
--- a/src/bias/Restraint.cpp
+++ b/src/bias/Restraint.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/ReweightBase.cpp b/src/bias/ReweightBase.cpp
index bfb5ddede456856503e4dc9f92b9a16ded6868ea..b3567cec3c9b6a79d81524c925f6ca94c99317f7 100644
--- a/src/bias/ReweightBase.cpp
+++ b/src/bias/ReweightBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/ReweightBase.h b/src/bias/ReweightBase.h
index f39e94d705b85932c9603cdc2b91b884cd5e3272..32d15892cd581e5bef6a88525fb5954dd286481d 100644
--- a/src/bias/ReweightBase.h
+++ b/src/bias/ReweightBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/ReweightBias.cpp b/src/bias/ReweightBias.cpp
index 60976e644d9d47bd2e931b9faddeaf68568eb049..31da1c48bbc946f5f21c77f9f4f2de0345867cf8 100644
--- a/src/bias/ReweightBias.cpp
+++ b/src/bias/ReweightBias.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/ReweightMetad.cpp b/src/bias/ReweightMetad.cpp
index 42a4855c24d81e1b51232056c9682c836a05193b..6d708d1624c052dadccb8340d77a4c5672ed5f38 100644
--- a/src/bias/ReweightMetad.cpp
+++ b/src/bias/ReweightMetad.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/ReweightTemperature.cpp b/src/bias/ReweightTemperature.cpp
index 203d4930ef439a2c356f780ddea6034a38d2396e..6c219bbf1a67d4157703e9710313c1a5aab2854b 100644
--- a/src/bias/ReweightTemperature.cpp
+++ b/src/bias/ReweightTemperature.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/bias/UWalls.cpp b/src/bias/UWalls.cpp
index bfe4d8929ef2f3ae245594d70450a80517861f16..866002efa9cc27a8337c8e8d92ddb48f5f5688e4 100644
--- a/src/bias/UWalls.cpp
+++ b/src/bias/UWalls.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/cltools/CLTool.h b/src/cltools/CLTool.h
index 3d5adbbc535d057f3eb64cc3275346224316223b..b4ad6e31bb5a8688a940bd124bb35ede4aef5032 100644
--- a/src/cltools/CLTool.h
+++ b/src/cltools/CLTool.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/cltools/Driver.cpp b/src/cltools/Driver.cpp
index 1a3bf513d3774681c2caf99c57a40dc06e34b1d7..cf62508ced7e670698a5ddd9ddabcdacff3fb987 100644
--- a/src/cltools/Driver.cpp
+++ b/src/cltools/Driver.cpp
@@ -101,47 +101,58 @@ will read a file produced by \ref DUMPMASSCHARGE .
 
 \par Examples
 
-The following command tells plumed to postprocess the trajectory contained in trajectory.xyz
- by performing the actions described in the input file plumed.dat.  If an action that takes the
+The following command tells plumed to postprocess the trajectory contained in `trajectory.xyz`
+ by performing the actions described in the input file `plumed.dat`.  If an action that takes the
 stride keyword is given a stride equal to \f$n\f$ then it will be performed only on every \f$n\f$th
-frame in the trajectory file.
+frames in the trajectory file.
 \verbatim
 plumed driver --plumed plumed.dat --ixyz trajectory.xyz
 \endverbatim
 
-The following command tells plumed to postprocess the trajectory contained in trajectory.xyz.
- by performing the actions described in the input file plumed.dat. Here though
---trajectory-stride is set equal to the frequency with which frames were output during the trajectory
-and the --timestep is equal to the simulation timestep.  As such the STRIDE parameters in the plumed.dat
-files are no longer ignored and any files output resemble those that would have been generated
-had we run the calculation we are running with driver when the MD simulation was running.
+Notice that `xyz` files are expected to be in internal PLUMED units, that is by default nm.
+You can change this behavior by using the `--length-units` option:
 \verbatim
-plumed driver --plumed plumed.dat --ixyz trajectory.xyz --trajectory-stride 100 --timestep 0.001
+plumed driver --plumed plumed.dat --ixyz trajectory.xyz --length-units A
 \endverbatim
-
-By default you have access to a subset of the trajectory file formats
-supported by VMD, e.g. xtc and dcd:
-
+The strings accepted by the `--length-units` options are the same ones accepted by the \ref UNITS action.
+Other file formats typically have their default coordinates (e.g., `gro` files are always in nm)
+and it thus should not be necessary to use the `--length-units` option. Additionally,
+consider that the units used by the `driver` might be different by the units used in the PLUMED input
+file `plumed.dat`. For instance consider the command:
 \verbatim
-plumed driver --plumed plumed.dat --pdb diala.pdb --mf_xtc traj.xtc --trajectory-stride 100 --timestep 0.001
+plumed driver --plumed plumed.dat --ixyz trajectory.xyz --length-units A
 \endverbatim
+where `plumed.dat` is
+\plumedfile
+# no explicit UNITS action here
+d: DISTANCE ATOMS=1,2
+PRINT ARG=d FILE=colvar
+\endplumedfile
+In this case, the driver reads the `xyz` file assuming it to contain coordinates in Angstrom units.
+However, the resulting `colvar` file contains a distance expressed in nm.
 
-where --mf_ prefixes the extension of one of the accepted molfile
-plugin format.
+The following command tells plumed to postprocess the trajectory contained in trajectory.xyz.
+ by performing the actions described in the input file plumed.dat.
+\verbatim
+plumed driver --plumed plumed.dat --ixyz trajectory.xyz --trajectory-stride 100 --timestep 0.001
+\endverbatim
+Here though
+`--trajectory-stride` is set equal to the frequency with which frames were output during the trajectory
+and the `--timestep` is equal to the simulation timestep.  As such the `STRIDE` parameters in the `plumed.dat`
+files are referred to the original timestep and any files output resemble those that would have been generated
+had we run the calculation we are running with driver when the MD simulation was running.
 
-To have support of all of VMD's plugins you need to recompile
-PLUMED. You need to download the SOURCE of VMD, which contains
-a plugins directory. Adapt build.sh and compile it. At
-the end, you should get the molfile plugins compiled as a static
-library libmolfile_plugin.a. Locate said file and libmolfile_plugin.h,
-and customize the configure command with something along
-the lines of:
+PLUMED can read natively xyz files (in PLUMED units) and gro files (in nm). In addition,
+PLUMED includes by default support for a
+subset of the trajectory file formats supported by VMD, e.g. xtc and dcd:
 
 \verbatim
-configure [...] LDFLAGS="-ltcl8.5 -L/mypathtomolfilelibrary/ -L/mypathtotcl" CPPFLAGS="-I/mypathtolibmolfile_plugin.h/"
+plumed driver --plumed plumed.dat --pdb diala.pdb --mf_xtc traj.xtc --trajectory-stride 100 --timestep 0.001
 \endverbatim
 
-and rebuild.
+where `--mf_` prefixes the extension of one of the accepted molfile plugin format.
+If PLUMED has been \ref Installation "installed" with full molfile support, other formats will be available.
+Just type `plumed driver --help` to see which plugins are available.
 
 Molfile plugin require periodic cell to be triangular (i.e. first vector oriented along x and
 second vector in xy plane). This is true for many MD codes. However, it could be false
@@ -152,14 +163,15 @@ the `--natoms` option:
 plumed driver --plumed plumed.dat --imf_crd trajectory.crd --natoms 128
 \endverbatim
 
-Check the available molfile plugins and limitations at http://www.ks.uiuc.edu/Research/vmd/plugins/molfile/.
+Check the available molfile plugins and limitations at [this link](http://www.ks.uiuc.edu/Research/vmd/plugins/molfile/).
 
 Additionally, you can use the xdrfile implementation of xtc and trr. To this aim, just
-download and install properly the xdrfile library (see here: http://www.gromacs.org/Developer_Zone/Programming_Guide/XTC_Library).
+download and install properly the xdrfile library (see [this link](http://www.gromacs.org/Developer_Zone/Programming_Guide/XTC_Library)).
 If the xdrfile library is installed properly the PLUMED configure script should be able to
 detect it and enable it.
 Notice that the xdrfile implementation of xtc and trr
 is more robust than the molfile one, since it provides support for generic cell shapes.
+In addition, it allows \ref DUMPATOMS to write compressed xtc files.
 
 
 */
diff --git a/src/cltools/DriverDouble.cpp b/src/cltools/DriverDouble.cpp
index 4ef9a46d2b476498cdb515157f495b72fb2e5e56..7cac3b4a3d8f8c1bf72b2e0f35299e178b623686 100644
--- a/src/cltools/DriverDouble.cpp
+++ b/src/cltools/DriverDouble.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/cltools/DriverFloat.cpp b/src/cltools/DriverFloat.cpp
index d410866dab7c3e88c755833f893afd1789b67e75..b7705e000c5e7565b31ab76e81a81b6fc8f22320 100644
--- a/src/cltools/DriverFloat.cpp
+++ b/src/cltools/DriverFloat.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/cltools/GenTemplate.cpp b/src/cltools/GenTemplate.cpp
index bce33af848066c9fca03cf1e6900a3a278b47708..8df42b9f63a332d471a1cea0a3d5ebb5f3e53028 100644
--- a/src/cltools/GenTemplate.cpp
+++ b/src/cltools/GenTemplate.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/cltools/Info.cpp b/src/cltools/Info.cpp
index fe9c1e1923c01ed5219b3f039f9bd249d0f0828d..1a78a2e50ba6322496257590d30bc3deb9d0a882 100644
--- a/src/cltools/Info.cpp
+++ b/src/cltools/Info.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/cltools/Manual.cpp b/src/cltools/Manual.cpp
index 4df53a696245be3325cdb6c4f41a8690bc22e694..00ed022d3cc5397cc8e87f52b477d190bd2a26a8 100644
--- a/src/cltools/Manual.cpp
+++ b/src/cltools/Manual.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/cltools/SimpleMD.cpp b/src/cltools/SimpleMD.cpp
index d94f89b8f726654da5da1876da10111789b7c088..78a938fa55fb114c29f2c9202c3d22bf4ac90940 100644
--- a/src/cltools/SimpleMD.cpp
+++ b/src/cltools/SimpleMD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/cltools/SumHills.cpp b/src/cltools/SumHills.cpp
index ffdc51874308221402986f974402e7728db6c8df..0dd09dee8b3ebc029299a338537e2870805f3b65 100644
--- a/src/cltools/SumHills.cpp
+++ b/src/cltools/SumHills.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/cltools/kT.cpp b/src/cltools/kT.cpp
index b1e25b4b8aebf2c44361f60e2216532baaec9e8f..57760a93b9ae4bf5b5eee8cc49de1424e0cab228 100644
--- a/src/cltools/kT.cpp
+++ b/src/cltools/kT.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Angle.cpp b/src/colvar/Angle.cpp
index 285d6fa5050eca25969e490cbc96ab4199d34f2b..7043068f8527fe8562aabf9759270221fd96bbf1 100644
--- a/src/colvar/Angle.cpp
+++ b/src/colvar/Angle.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Cell.cpp b/src/colvar/Cell.cpp
index 082fa237dbdba39aceb57dd087ef86f2ee71e370..15a2a1d674433977db791c7f45c53f6b6930bb6e 100644
--- a/src/colvar/Cell.cpp
+++ b/src/colvar/Cell.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Colvar.h b/src/colvar/Colvar.h
index 2d8904d64df09f0c340fe2eb9afa85c9919cca7c..50360ef87fc96a8e95ef8fca4cb4a817d0d5798b 100644
--- a/src/colvar/Colvar.h
+++ b/src/colvar/Colvar.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Constant.cpp b/src/colvar/Constant.cpp
index 247f9ac6d4ab5366692ac0b4eddada801d7c0691..21c99dc3984ebe4616d59d11ff4f68b1e8b455f8 100644
--- a/src/colvar/Constant.cpp
+++ b/src/colvar/Constant.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/ContactMap.cpp b/src/colvar/ContactMap.cpp
index 9fe8f82c9289d32026da05cc7103d69da5e56d17..eaed58d1c0e1e3750eed9bf2233d7eea66452db8 100644
--- a/src/colvar/ContactMap.cpp
+++ b/src/colvar/ContactMap.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Coordination.cpp b/src/colvar/Coordination.cpp
index cf964555895c5fd8fa65e6fa9790c4971ed0968f..ec56bff77d532eaecddaadd54e2d8fe53577e788 100644
--- a/src/colvar/Coordination.cpp
+++ b/src/colvar/Coordination.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/CoordinationBase.cpp b/src/colvar/CoordinationBase.cpp
index 2d1c6707a17fb091771343681d913d6215f9520e..89c6ec2cf6c87b64a3e3fb3a5b3613e141e019d7 100644
--- a/src/colvar/CoordinationBase.cpp
+++ b/src/colvar/CoordinationBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/CoordinationBase.h b/src/colvar/CoordinationBase.h
index 6b0f174cd34b992fba589a8af439e850253b7a54..4fb118639f45103f9b9d75deb0b8580e3ebecc0b 100644
--- a/src/colvar/CoordinationBase.h
+++ b/src/colvar/CoordinationBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/DHEnergy.cpp b/src/colvar/DHEnergy.cpp
index d13aeecdc5ae174ef36b45e7029061d8db15bded..5b66a59480f0adee0a52cf278af209ed4ae30417 100644
--- a/src/colvar/DHEnergy.cpp
+++ b/src/colvar/DHEnergy.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/DRMSD.cpp b/src/colvar/DRMSD.cpp
index 49efb882ad8db179c4fe19e6545fd03dec9300c7..9872c615d96661e4a45d4ed8680e5ac379b9112d 100644
--- a/src/colvar/DRMSD.cpp
+++ b/src/colvar/DRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Dipole.cpp b/src/colvar/Dipole.cpp
index 3cffa3553e0bda7c637c26b7aa7e607918d1a5d1..33d03d1643a56f94bc626dac5b676c632696e2d2 100644
--- a/src/colvar/Dipole.cpp
+++ b/src/colvar/Dipole.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Distance.cpp b/src/colvar/Distance.cpp
index 279961b7644759ed2012949b7c0b6037e88880fc..4ea1475dda7bb860cdab308d8a5ad9bdfabd233b 100644
--- a/src/colvar/Distance.cpp
+++ b/src/colvar/Distance.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Energy.cpp b/src/colvar/Energy.cpp
index 4b3f80736ef2a5d93163943604469821e9c4d9e5..f502d4c02e4dfa74b414473725dae6273cc92f54 100644
--- a/src/colvar/Energy.cpp
+++ b/src/colvar/Energy.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Fake.cpp b/src/colvar/Fake.cpp
index 20d70aed9ab5a93e06457ba15c75fc79f15e50ea..c9ac270586c97113085f01fd834abe97f5a28afa 100644
--- a/src/colvar/Fake.cpp
+++ b/src/colvar/Fake.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/FretEfficiency.cpp b/src/colvar/FretEfficiency.cpp
index e6f1494529cf9ccf5df2d718e44c798d180f7e9f..c626b515450c0e5d1628e2cf254a0a56b1d6e44b 100644
--- a/src/colvar/FretEfficiency.cpp
+++ b/src/colvar/FretEfficiency.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Gyration.cpp b/src/colvar/Gyration.cpp
index 3764ad404bef8faf64af02476b36038a9780d475..f811b21ca6a968e473b73789213810848a00c61a 100644
--- a/src/colvar/Gyration.cpp
+++ b/src/colvar/Gyration.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Jcoupling.cpp b/src/colvar/Jcoupling.cpp
index 8d8975f91b1e281616f5429546df8c0606a88e9b..4334ecfd2db22a3001cfcc531c0923d5c8cfeb8d 100644
--- a/src/colvar/Jcoupling.cpp
+++ b/src/colvar/Jcoupling.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/MultiRMSD.cpp b/src/colvar/MultiRMSD.cpp
index 4cf4ff08bfcdf0424ad531bfa4ef7525524f59e4..7adebf1b7d3658800ccf03a25ba7135404763feb 100644
--- a/src/colvar/MultiRMSD.cpp
+++ b/src/colvar/MultiRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/NOE.cpp b/src/colvar/NOE.cpp
index b46bd65978621d4098392dd7b86db172f71370f8..8a777c3d0dce276e0b9724d0addeb3d81ed0c630 100644
--- a/src/colvar/NOE.cpp
+++ b/src/colvar/NOE.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/PCARMSD.cpp b/src/colvar/PCARMSD.cpp
index 02861e10963e49e08558e9ce991e7a34e695a866..8f41f2c39e5755360425b18eafbe54a74ff875a9 100644
--- a/src/colvar/PCARMSD.cpp
+++ b/src/colvar/PCARMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/PRE.cpp b/src/colvar/PRE.cpp
index 82c94eee23f3a4f10465b27cabc5b537ef209ba8..3bcf3d316236d56a63c5ef444b1857dd8b04e2df 100644
--- a/src/colvar/PRE.cpp
+++ b/src/colvar/PRE.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/PathMSD.cpp b/src/colvar/PathMSD.cpp
index 17567f2d42b4001705bc34a895eb12de98db6fb1..2a6ded47c468469368d30f029f446d5950c4a66e 100644
--- a/src/colvar/PathMSD.cpp
+++ b/src/colvar/PathMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/PathMSDBase.h b/src/colvar/PathMSDBase.h
index dae1603cb589610e2dfae9f7ea40a853f6150b67..ff5f138467bf5d5d5d43d9e27f9c0235cadd7aaf 100644
--- a/src/colvar/PathMSDBase.h
+++ b/src/colvar/PathMSDBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Position.cpp b/src/colvar/Position.cpp
index b66ae5e6ca03a37de32414e7d5a442600ef36bb5..081c5ef296eed349ed2e64df31c13ce17154a6c1 100644
--- a/src/colvar/Position.cpp
+++ b/src/colvar/Position.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/PropertyMap.cpp b/src/colvar/PropertyMap.cpp
index eb1c27f0255a2b44d1482133ff2993e57cd3dc99..5a40811ccde5a59426deec018c69b61d5e44281c 100644
--- a/src/colvar/PropertyMap.cpp
+++ b/src/colvar/PropertyMap.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/RDC.cpp b/src/colvar/RDC.cpp
index 43dc4c1ee3f563989c03d597b7e74b007361cc7e..48ef11022ddb2aee97670368a67f4cdd6bfdda2f 100644
--- a/src/colvar/RDC.cpp
+++ b/src/colvar/RDC.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/RMSD.cpp b/src/colvar/RMSD.cpp
index bbc16bc468c2eea9685165d28e5da089931f3e3a..50c6574bb4388c99dce090837457e2d010d80d82 100644
--- a/src/colvar/RMSD.cpp
+++ b/src/colvar/RMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Template.cpp b/src/colvar/Template.cpp
index 6fb3c58451c46dc18ee631315692c5920f2e1df4..2a8d58d0542cebc5cae1359e753e98893b704c01 100644
--- a/src/colvar/Template.cpp
+++ b/src/colvar/Template.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/colvar/Volume.cpp b/src/colvar/Volume.cpp
index 837f6ce75871ad84840e8ea1d5be7a20dee2bc77..9a05ce2236d54af22a569b9ec644d23757fb60e5 100644
--- a/src/colvar/Volume.cpp
+++ b/src/colvar/Volume.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/config/Config.h b/src/config/Config.h
index 39c441e98d97dd461f0b9bce9bb42c44bdfac9a2..4b8d2cd0747822731e204a083de485549607326d 100644
--- a/src/config/Config.h
+++ b/src/config/Config.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/config/Config.inc.in b/src/config/Config.inc.in
index 6596895588a4e338f0ea561c0edc54f57da77a2d..e5a9e9bd31789cc6274393c3e71b0a8ceac0e97d 100644
--- a/src/config/Config.inc.in
+++ b/src/config/Config.inc.in
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ActionPilot.cpp b/src/core/ActionPilot.cpp
index fbd6d3bb2f1671953998b72bbe09f0c5caae9eb1..6f5cac4fb860b0977d22b2eef202896ad158abce 100644
--- a/src/core/ActionPilot.cpp
+++ b/src/core/ActionPilot.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ActionPilot.h b/src/core/ActionPilot.h
index bf3e0244634f44c17f795c69d2a830c5a9a240f3..aacc4554771003876622f98d2e2fa7fb6129bc5b 100644
--- a/src/core/ActionPilot.h
+++ b/src/core/ActionPilot.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ActionSetup.h b/src/core/ActionSetup.h
index d76a0bea1ab3319734440ba7f68f5fa935590516..b02937f92f54535b64321a487a7439f4cca43520 100644
--- a/src/core/ActionSetup.h
+++ b/src/core/ActionSetup.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ActionWithArguments.cpp b/src/core/ActionWithArguments.cpp
index 23b772938944c79889f5d7f2ad9811b078867462..ad3fe55fff5f8d8abf0a6c686bbc819cfec81e70 100644
--- a/src/core/ActionWithArguments.cpp
+++ b/src/core/ActionWithArguments.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ActionWithArguments.h b/src/core/ActionWithArguments.h
index 47a14b7607a25606988b91460f20f1752d8b9f43..406dcff8b4928a9e86cba460c2aec85d0a7eec13 100644
--- a/src/core/ActionWithArguments.h
+++ b/src/core/ActionWithArguments.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ActionWithValue.cpp b/src/core/ActionWithValue.cpp
index bc92a9410d8eb20335abfb5da88a8748b1c2f512..7c4f7bf6a8250398911efb468345084af76bfe9b 100644
--- a/src/core/ActionWithValue.cpp
+++ b/src/core/ActionWithValue.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ActionWithValue.h b/src/core/ActionWithValue.h
index 9d13f30d17767657ab3bbe916246c0f84db72fa4..cfc666c2a691293a05698aeaa6cf6c01da96373f 100644
--- a/src/core/ActionWithValue.h
+++ b/src/core/ActionWithValue.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ActionWithVirtualAtom.h b/src/core/ActionWithVirtualAtom.h
index 74bf868ae1c511aa08606d791478004df27f68d0..d2ddd24e9ed2e261425e460de79a2cd5a9fac7bc 100644
--- a/src/core/ActionWithVirtualAtom.h
+++ b/src/core/ActionWithVirtualAtom.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/CLTool.cpp b/src/core/CLTool.cpp
index c7441d41ed009c0ebea9a23c4642103aaf006940..65b1b1b2faf887442e39d4d9f5ccc3e73d3a86e2 100644
--- a/src/core/CLTool.cpp
+++ b/src/core/CLTool.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/CLTool.h b/src/core/CLTool.h
index c9ab30778e4033559a7d152bd92dbbf373d669f9..bf2ab2c58a90cbb3fe0abab034e8e3443d8fc72c 100644
--- a/src/core/CLTool.h
+++ b/src/core/CLTool.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/CLToolMain.cpp b/src/core/CLToolMain.cpp
index 5c3598b0e2165bd63bc2bcbf41f3457c2dcd131c..a3951b8fbf0ba5b37577036c86165a82797cf08d 100644
--- a/src/core/CLToolMain.cpp
+++ b/src/core/CLToolMain.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/CLToolMain.h b/src/core/CLToolMain.h
index a8cdb42e29be2aaecdc349ecbd3657c407a857af..a624acc9770646d9b53e6270b5258405592fe9a9 100644
--- a/src/core/CLToolMain.h
+++ b/src/core/CLToolMain.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/Colvar.cpp b/src/core/Colvar.cpp
index 239afdc8d32cc350f16e74f25d6235219c85467e..963d236338d49321593097e439be25c72ed0f6df 100644
--- a/src/core/Colvar.cpp
+++ b/src/core/Colvar.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/Colvar.h b/src/core/Colvar.h
index 4a7ef6a08bd557cbdbe542b630388aad7409068d..31bd861f22611f916b8abcaab60eaa2ac19380b3 100644
--- a/src/core/Colvar.h
+++ b/src/core/Colvar.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ExchangePatterns.cpp b/src/core/ExchangePatterns.cpp
index fdd22e74ecc8bb8e2d58275dfebbe2982ee148dc..65af7081746c212f2f98b24dd850926719413d56 100644
--- a/src/core/ExchangePatterns.cpp
+++ b/src/core/ExchangePatterns.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/ExchangePatterns.h b/src/core/ExchangePatterns.h
index 14099be4dad2155305c4d8ad7f881f5089bf0220..97481208d8978f10fc6af853288751ebc0724865 100644
--- a/src/core/ExchangePatterns.h
+++ b/src/core/ExchangePatterns.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/FlexibleBin.cpp b/src/core/FlexibleBin.cpp
index 62198f98be715485de044683c8f4f0023e34c32e..405bd603a86a4f333da48acc70acc659a47da000 100644
--- a/src/core/FlexibleBin.cpp
+++ b/src/core/FlexibleBin.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/FlexibleBin.h b/src/core/FlexibleBin.h
index 3bcbd16f089f3ebc5d6b558078e439374ef76706..783961e5890d20a5e2f6bf805a97566588484b49 100644
--- a/src/core/FlexibleBin.h
+++ b/src/core/FlexibleBin.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/GREX.h b/src/core/GREX.h
index 2266d1581f0188588a115ba2208f798f8613c15d..58f181cbefcade46582ae368d821199239e7b79e 100644
--- a/src/core/GREX.h
+++ b/src/core/GREX.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/MDAtoms.cpp b/src/core/MDAtoms.cpp
index 1f11ad9cd4045888454b47a054a6ed0472afb470..370527d2fbccffe344174ecf586990b6fa7f1b3a 100644
--- a/src/core/MDAtoms.cpp
+++ b/src/core/MDAtoms.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/PlumedMainInitializer.cpp b/src/core/PlumedMainInitializer.cpp
index b7fc8e3e458b37e1885eca2f9dfb47d1bbfba90f..7205dea3f67b6d2ed12ed50eb62d5f79e22b0a39 100644
--- a/src/core/PlumedMainInitializer.cpp
+++ b/src/core/PlumedMainInitializer.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/SetupMolInfo.cpp b/src/core/SetupMolInfo.cpp
index ece94a7f09d65c1158ee33755b41c2a36e21f6f0..eff9c98d3c2b1f3fac1c7af9714096cb02ce5964 100644
--- a/src/core/SetupMolInfo.cpp
+++ b/src/core/SetupMolInfo.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/SetupMolInfo.h b/src/core/SetupMolInfo.h
index 362073b8bd285b79c9fb4befcb21bea2fce92c0f..2f4341d6a5ac3c2b5a00e859cba0e6c21e89244f 100644
--- a/src/core/SetupMolInfo.h
+++ b/src/core/SetupMolInfo.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/TargetDist.cpp b/src/core/TargetDist.cpp
index 1bed184498149fb10d500465e29782ad4c70cfe4..62a451eacd73abdb3e7ebb41c7f51ac762f9a041 100644
--- a/src/core/TargetDist.cpp
+++ b/src/core/TargetDist.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/TargetDist.h b/src/core/TargetDist.h
index f90b8a4be2a17091932471f9b529106b6822bdfc..bd91bfaa03f52d4a3e3208ad7e9a1fca9021d2c1 100644
--- a/src/core/TargetDist.h
+++ b/src/core/TargetDist.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/Value.h b/src/core/Value.h
index 6bbd9b6ceea15efd862fea6dd01b541e05b582d9..1564a6231f906003e7a768baefc5f8a4cd627cbb 100644
--- a/src/core/Value.h
+++ b/src/core/Value.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/core/WithCmd.h b/src/core/WithCmd.h
index 0397c2e5c786c4576b15d314d13fd67d2e69ac79..1edac40d58ee62748e3b5fa0cd259e23981d0721 100644
--- a/src/core/WithCmd.h
+++ b/src/core/WithCmd.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/CubicHarmonicBase.cpp b/src/crystallization/CubicHarmonicBase.cpp
index 04a07426e128efd65d50523c9f588ab40ccee6b9..c0a8140c68094955bc8bec9d61415a79efa897ed 100644
--- a/src/crystallization/CubicHarmonicBase.cpp
+++ b/src/crystallization/CubicHarmonicBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/CubicHarmonicBase.h b/src/crystallization/CubicHarmonicBase.h
index 7986038a4ef63cb0fbda5ee6e662753c36f9965d..5ef163e30204687edf644c8f94c86731587a1878 100644
--- a/src/crystallization/CubicHarmonicBase.h
+++ b/src/crystallization/CubicHarmonicBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/Fccubic.cpp b/src/crystallization/Fccubic.cpp
index 47154f4c6f7d393c605f85a0a656b1da4717fe0c..dc78351c6293b239dd543170a1925e860d07763b 100644
--- a/src/crystallization/Fccubic.cpp
+++ b/src/crystallization/Fccubic.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/Gradient.cpp b/src/crystallization/Gradient.cpp
index e3af25856de604e00803a5a136a57895590263c7..24910e4237401c43ec59ed0b51b13d2d41e59256 100644
--- a/src/crystallization/Gradient.cpp
+++ b/src/crystallization/Gradient.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/Gradient.h b/src/crystallization/Gradient.h
index e639a84587d7d5aa2b5c6d784fdf2ee39c86f4c7..3132c2752a1c312b9206c261efaf8d7b93fc2984 100644
--- a/src/crystallization/Gradient.h
+++ b/src/crystallization/Gradient.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/GradientVessel.cpp b/src/crystallization/GradientVessel.cpp
index a266bbf019dc139220cf1aee5b10cfb2ad98eaec..d0a629623810973b686e8fc59131a1c613726cdd 100644
--- a/src/crystallization/GradientVessel.cpp
+++ b/src/crystallization/GradientVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/LocalSteinhardt.h b/src/crystallization/LocalSteinhardt.h
index c7ced6ab3576899349967b6567660b020b58a4b9..3fca53a9b7b6c2b82d396de4f2369bef18a1bb0d 100644
--- a/src/crystallization/LocalSteinhardt.h
+++ b/src/crystallization/LocalSteinhardt.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/Q3.cpp b/src/crystallization/Q3.cpp
index 038115a92158389807b110c24ea959e6785c31c7..10a1f9c301e48f3b8760c5d8b29da976f56ebca4 100644
--- a/src/crystallization/Q3.cpp
+++ b/src/crystallization/Q3.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/Q4.cpp b/src/crystallization/Q4.cpp
index a4f7d327b2545848609996a8d2fab50965a9616e..75390cfcb216dac68b9ef0dc72eb8a490302a65b 100644
--- a/src/crystallization/Q4.cpp
+++ b/src/crystallization/Q4.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/Q6.cpp b/src/crystallization/Q6.cpp
index a848174ab88fbee83044c3488cbec611d3e8f190..6762cbb8645f5392483e2c1fdb6b5448ad3dbe23 100644
--- a/src/crystallization/Q6.cpp
+++ b/src/crystallization/Q6.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/SMAC.cpp b/src/crystallization/SMAC.cpp
index 3d7085a979e6979fe76d70b420e2f8fa8aad17cf..c14e7fec97195b7ff1b78cf28deec572bba05ca8 100644
--- a/src/crystallization/SMAC.cpp
+++ b/src/crystallization/SMAC.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/SimpleCubic.cpp b/src/crystallization/SimpleCubic.cpp
index 2c15767c272aad5c6a60f595cccd39a86d1c60e8..e774f55000951a0a140c0cbefb3546c705ba8add 100644
--- a/src/crystallization/SimpleCubic.cpp
+++ b/src/crystallization/SimpleCubic.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/Steinhardt.cpp b/src/crystallization/Steinhardt.cpp
index b1d085bb0434e411f3aa4344080cdc9caba2d96d..bde82713aa40cf60265d3a0a32592e658ea0b2ac 100644
--- a/src/crystallization/Steinhardt.cpp
+++ b/src/crystallization/Steinhardt.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/crystallization/Tetrahedral.cpp b/src/crystallization/Tetrahedral.cpp
index 87c6e33ae87d942c012716bdcfc272538f20dd58..7c5b91545d4685e8e8d18dea8af96d2587495ea4 100644
--- a/src/crystallization/Tetrahedral.cpp
+++ b/src/crystallization/Tetrahedral.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/Combine.cpp b/src/function/Combine.cpp
index 62f66e35d81b082325724ee919ba968e72e39d6c..e7de7194b5c7a2b1de60a5cef08c8d5f174fad5d 100644
--- a/src/function/Combine.cpp
+++ b/src/function/Combine.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/Ensemble.cpp b/src/function/Ensemble.cpp
index bc1e05fb28569a74cea4b7b471bae55b784fb950..198f2fad391de5e2a016a9d77ed8597ec9fd6245 100644
--- a/src/function/Ensemble.cpp
+++ b/src/function/Ensemble.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/FuncSumHills.cpp b/src/function/FuncSumHills.cpp
index 65049b9b63d9d168732e6974040d481ffb2e9c49..e603cba6bedc97c78ac4284235cefdddc7865af9 100644
--- a/src/function/FuncSumHills.cpp
+++ b/src/function/FuncSumHills.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/Function.cpp b/src/function/Function.cpp
index 0852d31810a369ea750323789b19d5618b6c84a7..0f920c66f5966cb5589e28ed291ab78fa9a1b15e 100644
--- a/src/function/Function.cpp
+++ b/src/function/Function.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/Function.h b/src/function/Function.h
index 02215e1cce6af8f80471271aaf94251af89914ce..44cbe9a2a4d93887b8a0099c994cb458dc4187ee 100644
--- a/src/function/Function.h
+++ b/src/function/Function.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/LocalEnsemble.cpp b/src/function/LocalEnsemble.cpp
index 429a5a1436913f1a308dd700a67d8bb5903d742d..223294dff02817ac08dc2ec40d2b0e416cc3de58 100644
--- a/src/function/LocalEnsemble.cpp
+++ b/src/function/LocalEnsemble.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/Matheval.cpp b/src/function/Matheval.cpp
index d21907e68eb6e92c6533d4755439390a8ee6af41..ac2fb238217d95363850967762affbcae82e8304 100644
--- a/src/function/Matheval.cpp
+++ b/src/function/Matheval.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/Piecewise.cpp b/src/function/Piecewise.cpp
index ebd886de09e4c77fb8f2685b8d5dc5d1d50d53b2..9e216c6c39b600e57509d0821986a1172532ca1e 100644
--- a/src/function/Piecewise.cpp
+++ b/src/function/Piecewise.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/Sort.cpp b/src/function/Sort.cpp
index fc8e4ca233822da29806cd3b87e5809526235367..51a2cfa82016e6d371b585fa2aef17b328a1ff69 100644
--- a/src/function/Sort.cpp
+++ b/src/function/Sort.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/Stats.cpp b/src/function/Stats.cpp
index 438d8f98b86cede7896a77e57e794ee926ad47a5..5d057ddff0d1288575c1e364d26bd88be582301e 100644
--- a/src/function/Stats.cpp
+++ b/src/function/Stats.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/function/Target.cpp b/src/function/Target.cpp
index 1724cf3ff8263b4c40dfc68e4bd9e35ff7a4c3c0..fd30490c89efc7d7036ba1280ef929c5d9cd8c0f 100644
--- a/src/function/Target.cpp
+++ b/src/function/Target.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/DumpAtoms.cpp b/src/generic/DumpAtoms.cpp
index 5e613cf9a94814542706e3cb10852e3875faf907..bc98a58d20f3d58d3c179845595c1fdde9e2c7a9 100644
--- a/src/generic/DumpAtoms.cpp
+++ b/src/generic/DumpAtoms.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/DumpDerivatives.cpp b/src/generic/DumpDerivatives.cpp
index 38c686d7b4aec532684f2ce6f0dcd40f4319520f..c6dbfe9789087833c07c09e8c69c6cb617b44283 100644
--- a/src/generic/DumpDerivatives.cpp
+++ b/src/generic/DumpDerivatives.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/DumpForces.cpp b/src/generic/DumpForces.cpp
index a376de281a1cacc6b5a0b9dd7a0841aa10046309..5be6068dfd29f5bf1a0d51ca49a0fe880fb956ee 100644
--- a/src/generic/DumpForces.cpp
+++ b/src/generic/DumpForces.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/DumpMassCharge.cpp b/src/generic/DumpMassCharge.cpp
index 25224f3b3c5d643d9e721e5d215a5e874a8df80f..dee8133eca95ef7f68dcd627743ee25315cc7ff5 100644
--- a/src/generic/DumpMassCharge.cpp
+++ b/src/generic/DumpMassCharge.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/DumpProjections.cpp b/src/generic/DumpProjections.cpp
index c3a0ca7509104403884c8ca07bcd296681d14507..a22c82f1b227a65a07b2a523c28cfb0d407f5a13 100644
--- a/src/generic/DumpProjections.cpp
+++ b/src/generic/DumpProjections.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/EffectiveEnergyDrift.cpp b/src/generic/EffectiveEnergyDrift.cpp
index a9ca15e6c8e122d836072fb2924b7f5940b0d50c..841308606f688064d5b35ae5b35410b4698c1532 100644
--- a/src/generic/EffectiveEnergyDrift.cpp
+++ b/src/generic/EffectiveEnergyDrift.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/Include.cpp b/src/generic/Include.cpp
index 70f41716c87da2ff126e29a0f88bd896bf9661ce..50715e17ee7201a4dcbdad61069fc7fbe6f0a2b6 100644
--- a/src/generic/Include.cpp
+++ b/src/generic/Include.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/Print.cpp b/src/generic/Print.cpp
index 0fb11e02e3f9337209049dc07e65c3a406b51dab..69de0fd42d0e2d0f5189776679febd9db1ad10c9 100644
--- a/src/generic/Print.cpp
+++ b/src/generic/Print.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/RandomExchanges.cpp b/src/generic/RandomExchanges.cpp
index 60d2071207366b50bd2b883df290f33b0172e7ba..65debb4524784387d71cbeefcac530247ed17eed 100644
--- a/src/generic/RandomExchanges.cpp
+++ b/src/generic/RandomExchanges.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/Read.cpp b/src/generic/Read.cpp
index 63b8f8fc801157b83b460b1f0010bf777002c8d8..bb81b915e52faf3bf133600a5ba92dd03b66ea59 100644
--- a/src/generic/Read.cpp
+++ b/src/generic/Read.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/ResetCell.cpp b/src/generic/ResetCell.cpp
index 5268d52de348b3271e0b076a072c32d480d09e69..78cb7922f8ccfe69f755359e9a404b888a103faf 100644
--- a/src/generic/ResetCell.cpp
+++ b/src/generic/ResetCell.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/Time.cpp b/src/generic/Time.cpp
index 9a821f0b65dcf0a1318d6bb19ed5f005527f340a..a59346412d58cfc6284be6ea163bb2115889a09a 100644
--- a/src/generic/Time.cpp
+++ b/src/generic/Time.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/UpdateIf.cpp b/src/generic/UpdateIf.cpp
index 696e66c20f4eb423b661ba3214fcf2b68ca8953e..fa3fd2a7445dd1a6da071d3e84b18b5d0178b3a1 100644
--- a/src/generic/UpdateIf.cpp
+++ b/src/generic/UpdateIf.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/WholeMolecules.cpp b/src/generic/WholeMolecules.cpp
index e43c0aa07b571e2dfa9498146b5f2f4b24dfe7e3..03011829ac5f5a042b640225f367e68a9418223e 100644
--- a/src/generic/WholeMolecules.cpp
+++ b/src/generic/WholeMolecules.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/generic/WrapAround.cpp b/src/generic/WrapAround.cpp
index 6320ee4bbca6434e9dad48ffdf0a2ac2d9226dcb..bddafa3c1a854428c2d09d9cc69ba86e3364ecd5 100644
--- a/src/generic/WrapAround.cpp
+++ b/src/generic/WrapAround.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/ActionWithGrid.cpp b/src/gridtools/ActionWithGrid.cpp
index 2957ffd91820b1ca378da8bdecbc52933956113d..c9a0e342bfe030ac9adb32118b4a57a84b63f0de 100644
--- a/src/gridtools/ActionWithGrid.cpp
+++ b/src/gridtools/ActionWithGrid.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/ActionWithGrid.h b/src/gridtools/ActionWithGrid.h
index c01a50ef10a78bfcf66ea90cb09d15715cc69009..3328de532ddb7e0475b0280f0d1d85c4ab6d06b1 100644
--- a/src/gridtools/ActionWithGrid.h
+++ b/src/gridtools/ActionWithGrid.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/ActionWithInputGrid.cpp b/src/gridtools/ActionWithInputGrid.cpp
index 12d358115c7bf969ad70448e2ada6d4f25a5159a..71ac2031add45205b8a368c1f598ceff904f1a70 100644
--- a/src/gridtools/ActionWithInputGrid.cpp
+++ b/src/gridtools/ActionWithInputGrid.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/ActionWithInputGrid.h b/src/gridtools/ActionWithInputGrid.h
index cc1ba009e5655c6b365451ca4f26ee20be78afdd..387534b6c85dd46f43c4328256c8c62a3626721b 100644
--- a/src/gridtools/ActionWithInputGrid.h
+++ b/src/gridtools/ActionWithInputGrid.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/ActionWithIntegral.cpp b/src/gridtools/ActionWithIntegral.cpp
index 7deb7fbd39f47d278613dc1e3a6222bfd28a7ac0..f117103d43b1f1fe1f674f5ee67a666541c20718 100644
--- a/src/gridtools/ActionWithIntegral.cpp
+++ b/src/gridtools/ActionWithIntegral.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/AverageOnGrid.cpp b/src/gridtools/AverageOnGrid.cpp
index 0f9c5cc7379678d7f4d95d8e2f7617e3ae0fbe52..c14843d70385f249cdc0983e1acb8aceffe16e58 100644
--- a/src/gridtools/AverageOnGrid.cpp
+++ b/src/gridtools/AverageOnGrid.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/AverageOnGrid.h b/src/gridtools/AverageOnGrid.h
index ad38b50e71e87e9326b86bcd9d21b1935eb62ed9..c1f81960388658782b06bcd1858619a58e58260b 100644
--- a/src/gridtools/AverageOnGrid.h
+++ b/src/gridtools/AverageOnGrid.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/ContourFindingBase.cpp b/src/gridtools/ContourFindingBase.cpp
index 3a20dd6724c88c409438bddc85fef3f22d08c4aa..c3ac269db7a0ea1b3e8804dbc65769cb60c4ae9f 100644
--- a/src/gridtools/ContourFindingBase.cpp
+++ b/src/gridtools/ContourFindingBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/ContourFindingBase.h b/src/gridtools/ContourFindingBase.h
index 5a1752d5e55a1050f8602e7308354d1e77d482ff..4109f3c8e930102750d73f2f96094dae177ffd69 100644
--- a/src/gridtools/ContourFindingBase.h
+++ b/src/gridtools/ContourFindingBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/ConvertToFES.cpp b/src/gridtools/ConvertToFES.cpp
index 661aa2bde96e2116adb664bc58c5156d97d0923c..e28904b7478958eba2a3236a245fb707c1d79925 100644
--- a/src/gridtools/ConvertToFES.cpp
+++ b/src/gridtools/ConvertToFES.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/DumpCube.cpp b/src/gridtools/DumpCube.cpp
index f1df7406e75d598937d67bd313b0bdfcd3715ce4..3ebdd0ea40c284ba3830bc68159a12eb9b33b8c5 100644
--- a/src/gridtools/DumpCube.cpp
+++ b/src/gridtools/DumpCube.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/DumpGrid.cpp b/src/gridtools/DumpGrid.cpp
index e3524d563d67aa96c091fb389984959385c6a9de..8228280a1bbca9d71b2d152ad2dcbb60acf53ecd 100644
--- a/src/gridtools/DumpGrid.cpp
+++ b/src/gridtools/DumpGrid.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/FindContour.cpp b/src/gridtools/FindContour.cpp
index 1bae86d431cce76f9d7b98b24420bdcec41292b2..c0e4e12973f0796468d5d4f321fb30c972974807 100644
--- a/src/gridtools/FindContour.cpp
+++ b/src/gridtools/FindContour.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/FindContourSurface.cpp b/src/gridtools/FindContourSurface.cpp
index ce24d757f1a14d7fd8a8ac3ae3fa1c5a3624a9a1..a0570f0a95f1694f883cf90be8cb0e7e1536953e 100644
--- a/src/gridtools/FindContourSurface.cpp
+++ b/src/gridtools/FindContourSurface.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/FindSphericalContour.cpp b/src/gridtools/FindSphericalContour.cpp
index 7d36e818c882e99fcba0085a6409093cf8d7b425..5e58e338bad7ba851564aa95edbba48f61a41547 100644
--- a/src/gridtools/FindSphericalContour.cpp
+++ b/src/gridtools/FindSphericalContour.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/FourierTransform.cpp b/src/gridtools/FourierTransform.cpp
index 87a078336ebc5f7a4dfd2d7a8426a16d4be91386..76108a7be1d392797c86b22ecd625c1b26b24be7 100644
--- a/src/gridtools/FourierTransform.cpp
+++ b/src/gridtools/FourierTransform.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/GridPrintingBase.cpp b/src/gridtools/GridPrintingBase.cpp
index 616284d4598f1ef2fc305fd6702815e62eda71d6..86e4ecbf60b87ca982390f4e53493db45d1448e4 100644
--- a/src/gridtools/GridPrintingBase.cpp
+++ b/src/gridtools/GridPrintingBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/GridPrintingBase.h b/src/gridtools/GridPrintingBase.h
index d33865d73bdb9b17c1115d6f70c3b26d1de1e0d9..6a93b78b15e62cbb495ca425f78c7cf406f3e2ef 100644
--- a/src/gridtools/GridPrintingBase.h
+++ b/src/gridtools/GridPrintingBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/GridToXYZ.cpp b/src/gridtools/GridToXYZ.cpp
index 75e508a3f220b8cdfd033ac82e5397f46b4b7099..c384c6cbb653c59cd5a32cd2185dd6823a06f8c9 100644
--- a/src/gridtools/GridToXYZ.cpp
+++ b/src/gridtools/GridToXYZ.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/HistogramOnGrid.h b/src/gridtools/HistogramOnGrid.h
index 2eb9a253da4b6b69ca29c8ed327c759518455233..96044ffb77e0fe5e2bcd99aa34af11b92af4470e 100644
--- a/src/gridtools/HistogramOnGrid.h
+++ b/src/gridtools/HistogramOnGrid.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/gridtools/InterpolateGrid.cpp b/src/gridtools/InterpolateGrid.cpp
index 7fbc1d65d334757ce8e712cc59345f6202eb878f..7af64f5f208cb8738828a7cb03a62d4ae2d31eb1 100644
--- a/src/gridtools/InterpolateGrid.cpp
+++ b/src/gridtools/InterpolateGrid.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 4e3d6376cd627d83adbe9fab1a0e9a5f0e1b5694..03825a867ae654365ab4be03140ce7b3e79a3da6 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/manyrestraints/LWalls.cpp b/src/manyrestraints/LWalls.cpp
index c98405d04e40d3a232d052f43ac38f3df99662c3..3bbddeb16c799f9687c08c7b78f87bab97f1c0e8 100644
--- a/src/manyrestraints/LWalls.cpp
+++ b/src/manyrestraints/LWalls.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/manyrestraints/ManyRestraintsBase.cpp b/src/manyrestraints/ManyRestraintsBase.cpp
index d13d51cfacb5d1e14ce3eea73712fbea9668f570..39e0b553f1a8fa766fa956acfca16c31b08907b0 100644
--- a/src/manyrestraints/ManyRestraintsBase.cpp
+++ b/src/manyrestraints/ManyRestraintsBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/manyrestraints/ManyRestraintsBase.h b/src/manyrestraints/ManyRestraintsBase.h
index 565ea340df6d3b22d8eff95ea4381b1ef900c182..fc60c965e32ff0733d5d97c20f2cd75beb909fea 100644
--- a/src/manyrestraints/ManyRestraintsBase.h
+++ b/src/manyrestraints/ManyRestraintsBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/manyrestraints/UWalls.cpp b/src/manyrestraints/UWalls.cpp
index 2c0f75367da490b1cba34e54896379e47a4eddd5..7cc9b3120afb501c03e4fca78d02903d4be65827 100644
--- a/src/manyrestraints/UWalls.cpp
+++ b/src/manyrestraints/UWalls.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/mapping/Mapping.cpp b/src/mapping/Mapping.cpp
index c1a6dba33d422eeb84ac641a25df19c722160077..c0006dd684561db7d08e5eaa9e97e7b708ece91d 100644
--- a/src/mapping/Mapping.cpp
+++ b/src/mapping/Mapping.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/mapping/Mapping.h b/src/mapping/Mapping.h
index 02299d4c3a304be4c38b965319b782bc3b014ca9..1fea8be58b3f94077066d17fd7f7b4abfb212b44 100644
--- a/src/mapping/Mapping.h
+++ b/src/mapping/Mapping.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/mapping/PCAVars.cpp b/src/mapping/PCAVars.cpp
index 20ae003016ae482155fc3d8ee446e8a7813fb829..622ee712b1dd62625f52506ebcbbe00bd19b6fb6 100644
--- a/src/mapping/PCAVars.cpp
+++ b/src/mapping/PCAVars.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/mapping/Path.cpp b/src/mapping/Path.cpp
index 4808fad15dd52176845faa3afea24d097c0caad0..7ab9b2722c6368ee279a2b48501af56c28262814 100644
--- a/src/mapping/Path.cpp
+++ b/src/mapping/Path.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/mapping/PathBase.cpp b/src/mapping/PathBase.cpp
index af50f0375d528cfe826b8159fd74b98305cd34b7..1836f2fe15434ec1fcddc3cbbf26a19cebf2c685 100644
--- a/src/mapping/PathBase.cpp
+++ b/src/mapping/PathBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/mapping/PathBase.h b/src/mapping/PathBase.h
index ab98922f668bfd2513b86a09adf92435dd494327..dbddfad916c54b7b353e8c79707de7a8ca87e593 100644
--- a/src/mapping/PathBase.h
+++ b/src/mapping/PathBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/mapping/PropertyMap.cpp b/src/mapping/PropertyMap.cpp
index 91c96f4dd650734700561adadb19a868b2fd1ce1..18630cfdd446a809e6215254106ed4bfc96d3ddf 100644
--- a/src/mapping/PropertyMap.cpp
+++ b/src/mapping/PropertyMap.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/mapping/SpathVessel.cpp b/src/mapping/SpathVessel.cpp
index 23271e14f6355a41c461684c227556a3f9c7afb4..51b01fa6e4dfba3488ba2b4c2104ff209f3e272a 100644
--- a/src/mapping/SpathVessel.cpp
+++ b/src/mapping/SpathVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/mapping/ZpathVessel.cpp b/src/mapping/ZpathVessel.cpp
index 9c8606a8f2e537b8ad299c8f81275f20e535cecd..bcc12d06ba96b9f74f3281baf883c5a6a8426e0f 100644
--- a/src/mapping/ZpathVessel.cpp
+++ b/src/mapping/ZpathVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/ActionVolume.cpp b/src/multicolvar/ActionVolume.cpp
index 5f12881e13af04cf67df53d6edb819b3582db364..d57f55b682e8f71eb374ba3f18289daf161049ba 100644
--- a/src/multicolvar/ActionVolume.cpp
+++ b/src/multicolvar/ActionVolume.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/ActionVolume.h b/src/multicolvar/ActionVolume.h
index f71cbca3947a9e39a3dc73dccec3ec95aaab065a..362c2183f07af9ffba9cd39dd6f4d3524e5f40a5 100644
--- a/src/multicolvar/ActionVolume.h
+++ b/src/multicolvar/ActionVolume.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/AtomValuePack.cpp b/src/multicolvar/AtomValuePack.cpp
index 99a52a8fb5c609adc6a1946146a011c4102114bd..7dfaa0e41ef85f547ea0c5cdda1a4953d4ff652d 100644
--- a/src/multicolvar/AtomValuePack.cpp
+++ b/src/multicolvar/AtomValuePack.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/AtomValuePack.h b/src/multicolvar/AtomValuePack.h
index c98aa3265f95de0ceb6e96a19965e716895338ba..d9bd42d1663f3e04bc90488acdade4c9d2274dbf 100644
--- a/src/multicolvar/AtomValuePack.h
+++ b/src/multicolvar/AtomValuePack.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/CatomPack.cpp b/src/multicolvar/CatomPack.cpp
index 900fa5e7066be2be9e95869c9da7f3a7ac117d52..583a48ff48a7d0dcb145f9a84cb1772236d03cc8 100644
--- a/src/multicolvar/CatomPack.cpp
+++ b/src/multicolvar/CatomPack.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/CatomPack.h b/src/multicolvar/CatomPack.h
index 130e971cdbd2395200756418e0692cce0aac8206..d5ad04497a4773f0e2bf90032a20c8d5ca3096ef 100644
--- a/src/multicolvar/CatomPack.h
+++ b/src/multicolvar/CatomPack.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/CoordinationNumbers.cpp b/src/multicolvar/CoordinationNumbers.cpp
index ea2723e1009d709a9df627da6b51f343121d8ff2..4b69c0bb1adb4be1dd12d07925e9a83cbf5eb281 100644
--- a/src/multicolvar/CoordinationNumbers.cpp
+++ b/src/multicolvar/CoordinationNumbers.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/DumpMultiColvar.cpp b/src/multicolvar/DumpMultiColvar.cpp
index fb08af5b4437eb54b8cb6e07d63e2380f13626ef..4ee9f9c5093c85127977bd7df89022f12006f3d0 100644
--- a/src/multicolvar/DumpMultiColvar.cpp
+++ b/src/multicolvar/DumpMultiColvar.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/MultiColvarFilter.cpp b/src/multicolvar/MultiColvarFilter.cpp
index 8d8b0c2be106307ef67b6de7ab62f058b35a7031..1aed4790811ac90f798b557b0768fad2d831e588 100644
--- a/src/multicolvar/MultiColvarFilter.cpp
+++ b/src/multicolvar/MultiColvarFilter.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/MultiColvarFilter.h b/src/multicolvar/MultiColvarFilter.h
index e6310bf1092650c08e51322a00ee0803c2c38d54..5662cbffb3f31aa8a6568f249850f6e4bff9ce14 100644
--- a/src/multicolvar/MultiColvarFilter.h
+++ b/src/multicolvar/MultiColvarFilter.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/VolumeAround.cpp b/src/multicolvar/VolumeAround.cpp
index d44f36d4b27857829b5a34877d8fa64a10c7e800..d224041c3f5bdb51e881ed4de68d8b877db31bae 100644
--- a/src/multicolvar/VolumeAround.cpp
+++ b/src/multicolvar/VolumeAround.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/VolumeCavity.cpp b/src/multicolvar/VolumeCavity.cpp
index 70d8254f323433ae025019d363ee46254bbabac5..97ecc7807e88e79c5c43d65108ada4cc3137607d 100644
--- a/src/multicolvar/VolumeCavity.cpp
+++ b/src/multicolvar/VolumeCavity.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/VolumeGradientBase.h b/src/multicolvar/VolumeGradientBase.h
index 31cb5332fc25e5cf1e26ef5eab27920565ee95ce..d561e58ceaa9b90402765e5f21636bef081bcf52 100644
--- a/src/multicolvar/VolumeGradientBase.h
+++ b/src/multicolvar/VolumeGradientBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/multicolvar/VolumeTetrapore.cpp b/src/multicolvar/VolumeTetrapore.cpp
index c7dcd66d04324e564adc15fd9a66a4faafb89787..b2a141a5e16b85591a3cbf4b314cb6f64c6170c4 100644
--- a/src/multicolvar/VolumeTetrapore.cpp
+++ b/src/multicolvar/VolumeTetrapore.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ArgumentOnlyDistance.cpp b/src/reference/ArgumentOnlyDistance.cpp
index 0e4a3e2aee2f299449744093596063d8c72cdcad..f0e20fee7304c3e7c210f9d5690e73a4e0546fd8 100644
--- a/src/reference/ArgumentOnlyDistance.cpp
+++ b/src/reference/ArgumentOnlyDistance.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ArgumentOnlyDistance.h b/src/reference/ArgumentOnlyDistance.h
index 3636f0764e5c22f39ba113ce53e9a9d8a905dd55..3e292b3f3434068bc6227df0725563ed59fe0b44 100644
--- a/src/reference/ArgumentOnlyDistance.h
+++ b/src/reference/ArgumentOnlyDistance.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/DRMSD.h b/src/reference/DRMSD.h
index e99f382f4e616987558ea2129c714fc30e2c0ee2..517abb82cb23abd499a0729cfd8f991e159148f6 100644
--- a/src/reference/DRMSD.h
+++ b/src/reference/DRMSD.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/Direction.cpp b/src/reference/Direction.cpp
index 5e50e9b33340ede6eea2a99d924a94d25c9d43f1..81670900c288c2c208b655dc119d9727bb52243a 100644
--- a/src/reference/Direction.cpp
+++ b/src/reference/Direction.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/Direction.h b/src/reference/Direction.h
index ced2ac4153e182a002dc940ce4a8d3a1e17e50e0..34f6a11a20aa302893827e980f4173e8d27e0c58 100644
--- a/src/reference/Direction.h
+++ b/src/reference/Direction.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/DotProductDistance.cpp b/src/reference/DotProductDistance.cpp
index 0b0f4eb73de82b3dcf9bb6fbc0d6a4ad39491888..9582f65a35dad2aa1aa321c9f3c4fee6777a5635 100644
--- a/src/reference/DotProductDistance.cpp
+++ b/src/reference/DotProductDistance.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/EuclideanDistance.cpp b/src/reference/EuclideanDistance.cpp
index 244e16c66f3fc3efe699ccff9abdaac5d91621fa..52063a0025c1700acb312ebf7379ae0ee39ec5a7 100644
--- a/src/reference/EuclideanDistance.cpp
+++ b/src/reference/EuclideanDistance.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/FakeFrame.h b/src/reference/FakeFrame.h
index 2929d725b552343fe21baabb61601a86e1c139f2..7a4b36830490018df9b5da2e89335ae9211b7662 100644
--- a/src/reference/FakeFrame.h
+++ b/src/reference/FakeFrame.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/IntermolecularDRMSD.cpp b/src/reference/IntermolecularDRMSD.cpp
index 6903c83522516da9adad552339152270fa02cd20..a50ab13f0b2405b66442d3f22331a4f7916fb482 100644
--- a/src/reference/IntermolecularDRMSD.cpp
+++ b/src/reference/IntermolecularDRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/IntramolecularDRMSD.cpp b/src/reference/IntramolecularDRMSD.cpp
index 2a7b4b64ff7ff3d80d90621da84bfbf774b70659..00d3ab06942e748187e247a37d35b46549f3aa50 100644
--- a/src/reference/IntramolecularDRMSD.cpp
+++ b/src/reference/IntramolecularDRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/MahalanobisDistance.cpp b/src/reference/MahalanobisDistance.cpp
index 19a3e9669799abb31ee5d83145a50c1a77e87315..0306bca066283b6f9a318c67ca5244700deaef43 100644
--- a/src/reference/MahalanobisDistance.cpp
+++ b/src/reference/MahalanobisDistance.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/MetricRegister.h b/src/reference/MetricRegister.h
index 64cb3424efb9a861853d5891e7a77e181ca6b7ce..fa70830e6dd9edeec86a453afa907d7012f4a74d 100644
--- a/src/reference/MetricRegister.h
+++ b/src/reference/MetricRegister.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/MultiDomainRMSD.cpp b/src/reference/MultiDomainRMSD.cpp
index fc0bcca62eede45a78b25fd107978ea135392612..53c286ab9ae0446a2bea3cc39bee3b5dffee3934 100644
--- a/src/reference/MultiDomainRMSD.cpp
+++ b/src/reference/MultiDomainRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/MultiDomainRMSD.h b/src/reference/MultiDomainRMSD.h
index 524f42f42b103d5271eacd020b083341f775b6c0..10b122113d1ddeaac3d186b0b7085e5bc9c951e6 100644
--- a/src/reference/MultiDomainRMSD.h
+++ b/src/reference/MultiDomainRMSD.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/MultiReferenceBase.cpp b/src/reference/MultiReferenceBase.cpp
index 3468d1c1370baf5d11c27a02c54ee9b585b9a2b7..5b3ab06e90b0d759ffc8ea50de9080a7190988d4 100644
--- a/src/reference/MultiReferenceBase.cpp
+++ b/src/reference/MultiReferenceBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/MultiReferenceBase.h b/src/reference/MultiReferenceBase.h
index 3731ae07cbc7ad7b54f47f9c6999f199c2e2011a..15fddd395bc79347c448046d25ac9d2cb59cb780 100644
--- a/src/reference/MultiReferenceBase.h
+++ b/src/reference/MultiReferenceBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/NormalizedEuclideanDistance.cpp b/src/reference/NormalizedEuclideanDistance.cpp
index 9b4d14a32197212ff25b3288a7273e17465b25ff..e375b26c1ecbf08c611158f730d14de3301b28ad 100644
--- a/src/reference/NormalizedEuclideanDistance.cpp
+++ b/src/reference/NormalizedEuclideanDistance.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/OptimalRMSD.cpp b/src/reference/OptimalRMSD.cpp
index dc4d7f31b4aec31ecb52db4797d728ae3c24f300..0463a9070d24689696715ad2443d5144580fb397 100644
--- a/src/reference/OptimalRMSD.cpp
+++ b/src/reference/OptimalRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/PointWiseMapping.cpp b/src/reference/PointWiseMapping.cpp
index cf3747ba6027ac1ffa6b2ea9034052f9ca3cf1e4..0e81e9367655649b125f199bd4ae0f9cd145b003 100644
--- a/src/reference/PointWiseMapping.cpp
+++ b/src/reference/PointWiseMapping.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/PointWiseMapping.h b/src/reference/PointWiseMapping.h
index a530d3492b964fbba7e46f83cbd5f113a46f9bb1..b06abe9e73a8dbe7445584aca899661e6e427644 100644
--- a/src/reference/PointWiseMapping.h
+++ b/src/reference/PointWiseMapping.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/RMSDBase.cpp b/src/reference/RMSDBase.cpp
index 68b30e099fccb1e6631eafc8505c5cebe4664742..d5a95f22318b92be62c0f9e18dc0b955af64adbd 100644
--- a/src/reference/RMSDBase.cpp
+++ b/src/reference/RMSDBase.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/RMSDBase.h b/src/reference/RMSDBase.h
index e1fb621e26553944556f375569f0af22217e6c9d..6f14cca35f74910a83af1cebd88ad929893503bf 100644
--- a/src/reference/RMSDBase.h
+++ b/src/reference/RMSDBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ReferenceArguments.cpp b/src/reference/ReferenceArguments.cpp
index e051f1d7b26374978fb1e7fdcd59e2c503d50c38..bea11a78490c09cae6dc2c776d6535728dfb5a22 100644
--- a/src/reference/ReferenceArguments.cpp
+++ b/src/reference/ReferenceArguments.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ReferenceArguments.h b/src/reference/ReferenceArguments.h
index 6d1fc0e005ce40e74f692f9ee5880c973e230d50..a53bddade0ca4d7570038c34bfee144aec277b91 100644
--- a/src/reference/ReferenceArguments.h
+++ b/src/reference/ReferenceArguments.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ReferenceAtoms.cpp b/src/reference/ReferenceAtoms.cpp
index 7120786f3ca872d2f38a832695f4a4964465caf9..bf6ae128e99ec9518241486b78dbc3e6b486e0e2 100644
--- a/src/reference/ReferenceAtoms.cpp
+++ b/src/reference/ReferenceAtoms.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ReferenceAtoms.h b/src/reference/ReferenceAtoms.h
index 045171f640c48d6239b24af85f4521fdb05ac030..8aba74744ae3efc11bf106403fddc600ad3e7aca 100644
--- a/src/reference/ReferenceAtoms.h
+++ b/src/reference/ReferenceAtoms.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ReferenceConfiguration.cpp b/src/reference/ReferenceConfiguration.cpp
index 61d554a20590da7c57bf7d7dfc81d2392648718e..71e6c9fa08acdd95fb41226db99a2b8c8fc76c21 100644
--- a/src/reference/ReferenceConfiguration.cpp
+++ b/src/reference/ReferenceConfiguration.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ReferenceConfiguration.h b/src/reference/ReferenceConfiguration.h
index 44f39bacc6dcdf79474af53908cd0a63d80a2d22..ca46f788cf46aad116fa1f66470afc14752a7207 100644
--- a/src/reference/ReferenceConfiguration.h
+++ b/src/reference/ReferenceConfiguration.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ReferenceValuePack.cpp b/src/reference/ReferenceValuePack.cpp
index 106e1f148727cbe8b5ff6df970a7163d745daef3..a5386d94b11cdabab301177ab1991b966d5e4e23 100644
--- a/src/reference/ReferenceValuePack.cpp
+++ b/src/reference/ReferenceValuePack.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/ReferenceValuePack.h b/src/reference/ReferenceValuePack.h
index d5bc2078bfcb4a2a4117cc42b52be0f1750b1d9d..086f90fb5179ceb5a7ffca5d14f906411ac66ed3 100644
--- a/src/reference/ReferenceValuePack.h
+++ b/src/reference/ReferenceValuePack.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/SimpleRMSD.cpp b/src/reference/SimpleRMSD.cpp
index 4c0d82532606447683b6fa9b94ce9ccd3ac46f42..f9b4c28e4031ce2921865e959d5b08462220298f 100644
--- a/src/reference/SimpleRMSD.cpp
+++ b/src/reference/SimpleRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/SingleDomainRMSD.cpp b/src/reference/SingleDomainRMSD.cpp
index a499e6670987636a4415423d533225d5f069a8b7..be924ff31f0baa9e7fae5bafedc8e89439229363 100644
--- a/src/reference/SingleDomainRMSD.cpp
+++ b/src/reference/SingleDomainRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/reference/SingleDomainRMSD.h b/src/reference/SingleDomainRMSD.h
index 9ecf96123d989083b492cba6ec61447b35b864c9..de7fc24c999066e11fccb642b47d3c7e56219fca 100644
--- a/src/reference/SingleDomainRMSD.h
+++ b/src/reference/SingleDomainRMSD.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/secondarystructure/AlphaRMSD.cpp b/src/secondarystructure/AlphaRMSD.cpp
index ecf10eacb32de321aa4b63b509c050279713080b..337fcdfe8afb934679a1daf084f1b20214d77995 100644
--- a/src/secondarystructure/AlphaRMSD.cpp
+++ b/src/secondarystructure/AlphaRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/secondarystructure/AntibetaRMSD.cpp b/src/secondarystructure/AntibetaRMSD.cpp
index 637e4c0b38522f58aec85f9860ac058964c0c6e9..780e378bc183db5b68d9b11b7d13f9299a3c24cb 100644
--- a/src/secondarystructure/AntibetaRMSD.cpp
+++ b/src/secondarystructure/AntibetaRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/secondarystructure/ParabetaRMSD.cpp b/src/secondarystructure/ParabetaRMSD.cpp
index 1a67ec8afcf6de744c7b99882055c7731615ddea..c28bee1f1f7c563130274130d0dfc7c352fd7a67 100644
--- a/src/secondarystructure/ParabetaRMSD.cpp
+++ b/src/secondarystructure/ParabetaRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/secondarystructure/SecondaryStructureRMSD.cpp b/src/secondarystructure/SecondaryStructureRMSD.cpp
index 8c51dc8edb1bad343f55e103bb6ad890be062321..629ea1fc96aa856df1933f1e13c07447bc914715 100644
--- a/src/secondarystructure/SecondaryStructureRMSD.cpp
+++ b/src/secondarystructure/SecondaryStructureRMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/secondarystructure/SecondaryStructureRMSD.h b/src/secondarystructure/SecondaryStructureRMSD.h
index 336d3bec8eff1a8e43ed16994a99c2c867d63e4d..a5291bb02ae6b10cfb80b9f2f5d7e2d2d99b1c51 100644
--- a/src/secondarystructure/SecondaryStructureRMSD.h
+++ b/src/secondarystructure/SecondaryStructureRMSD.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/setup/Load.cpp b/src/setup/Load.cpp
index 4002ed0f0ff6671d04b5f9d9aa7ef1068e13e027..9d5ee8ec086463c1a21a02d85eb0a634c5c575cb 100644
--- a/src/setup/Load.cpp
+++ b/src/setup/Load.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/setup/Restart.cpp b/src/setup/Restart.cpp
index c33bbe1a4ff7a975b468ce15cc4cf7a0da5818af..e72c1832a05944fad6ab1b720b6f43a80b4f407e 100644
--- a/src/setup/Restart.cpp
+++ b/src/setup/Restart.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/setup/Units.cpp b/src/setup/Units.cpp
index edd45fe4f9e24436f8784cc71c6c5c5d0dcc63bf..07d244e12ccfcf578b9b9c6c4c4c9de389860c79 100644
--- a/src/setup/Units.cpp
+++ b/src/setup/Units.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Angle.cpp b/src/tools/Angle.cpp
index c3841e1282541eebec92e4759b80d09d9173e87f..6b23a25f9bbfff4efefea3e2fcdce4f358edda03 100644
--- a/src/tools/Angle.cpp
+++ b/src/tools/Angle.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Angle.h b/src/tools/Angle.h
index 1d6a58e520aa2e1601d736e25fffc59a09855614..2e326f10473113a34378582a5a4f52cdc0db4a87 100644
--- a/src/tools/Angle.h
+++ b/src/tools/Angle.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/AtomNumber.h b/src/tools/AtomNumber.h
index 60eb9ca7755a4e29a2cb1a1480c6e7d6dfdbae9c..98f24222b3896bb880177ac84f09c2aec140f719 100644
--- a/src/tools/AtomNumber.h
+++ b/src/tools/AtomNumber.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/BiasRepresentation.h b/src/tools/BiasRepresentation.h
index 9533e53c498dd1f89646629ee4e995c0461692d1..fac52aaddc40c6436036f41ed1d5a01b8ddca2ca 100644
--- a/src/tools/BiasRepresentation.h
+++ b/src/tools/BiasRepresentation.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Brent1DRootSearch.h b/src/tools/Brent1DRootSearch.h
index 138760737c6ff6b901121cdaf404e2e3a855e8ff..cced1aee9fdc94cb22921e4c9d3540561332b454 100644
--- a/src/tools/Brent1DRootSearch.h
+++ b/src/tools/Brent1DRootSearch.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Citations.cpp b/src/tools/Citations.cpp
index 508255c2c55dc82a1092515dfde50ee49b12800a..d9b11bd9c001c76c5e5499a4ca3dc4521ed3a232 100644
--- a/src/tools/Citations.cpp
+++ b/src/tools/Citations.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Citations.h b/src/tools/Citations.h
index 7d7ba10beeb481a2b52dd5821e62fa82252beda7..e65ed034391d843b0b2381f7126a75a264134935 100644
--- a/src/tools/Citations.h
+++ b/src/tools/Citations.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Communicator.cpp b/src/tools/Communicator.cpp
index ac10f3931adfdee28156631066f5021e6693e273..91aff7374c6446848a0c346d669b3d0f4abe3598 100644
--- a/src/tools/Communicator.cpp
+++ b/src/tools/Communicator.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Communicator.h b/src/tools/Communicator.h
index 86ef8314d6c2633bbc6771ae7c081ae383ee9a76..a1675b90af78d771192eb6ee1b5cbf84d95eb1ea 100644
--- a/src/tools/Communicator.h
+++ b/src/tools/Communicator.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/CubicInterpolation.cpp b/src/tools/CubicInterpolation.cpp
index fd35339bd585d44719813ec0b794f508226661e3..d18c7ab0e9857bd190beaef8c0a48a29393cc0a4 100644
--- a/src/tools/CubicInterpolation.cpp
+++ b/src/tools/CubicInterpolation.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/CubicInterpolation.h b/src/tools/CubicInterpolation.h
index fdbdcc3615157d32acef82081f4a4e0bb1874488..bac3bea4db903487cf02a0942df988c176ec9c8b 100644
--- a/src/tools/CubicInterpolation.h
+++ b/src/tools/CubicInterpolation.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/DLLoader.cpp b/src/tools/DLLoader.cpp
index b56e4c2367ce551bc7705bcdc3de5664f832fd54..c778c4c3d60094f6b3c30438000cc4c450511249 100644
--- a/src/tools/DLLoader.cpp
+++ b/src/tools/DLLoader.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/DLLoader.h b/src/tools/DLLoader.h
index fdad73f2a135b941a2a2fc567186fad53ac46abb..31bf32916209d9abbd82a6c03cc48fd3113c2967 100644
--- a/src/tools/DLLoader.h
+++ b/src/tools/DLLoader.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/DynamicList.h b/src/tools/DynamicList.h
index c5252de5b099e3b45b4b7a3726f13aadcd28d970..d38585cf7c4a9ce291a3ef5f9437888222a6cbb5 100644
--- a/src/tools/DynamicList.h
+++ b/src/tools/DynamicList.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/ERMSD.cpp b/src/tools/ERMSD.cpp
index 65c9da9f275e8834383e797118e8eac79f454caa..1a4771cad728342c9c3a792780ecc7ecc11ecb08 100644
--- a/src/tools/ERMSD.cpp
+++ b/src/tools/ERMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/ERMSD.h b/src/tools/ERMSD.h
index f07d83711afbcf239d98c0e7ceaceeb0463c7231..daa6264a0e0ca903101952465b91853b63a52ca0 100644
--- a/src/tools/ERMSD.h
+++ b/src/tools/ERMSD.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Exception.cpp b/src/tools/Exception.cpp
index 223b4b14176b01c0522d197518e0d22d2b3591ff..bff700d7c81536ea24901bcaff0099bfc5b80eac 100644
--- a/src/tools/Exception.cpp
+++ b/src/tools/Exception.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Exception.h b/src/tools/Exception.h
index 9e3c6dcf2ffa60c7a241fceb0dc55ec29439f81d..6dfbb7703aca234d4754eaf1770ea45fc091fee6 100644
--- a/src/tools/Exception.h
+++ b/src/tools/Exception.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/HistogramBead.cpp b/src/tools/HistogramBead.cpp
index bdef4556f6ae5c7c8cbdf2f1d16f30e5c5d8018a..9c97a6033b0251dc9a9777dee4b0dd7334593053 100644
--- a/src/tools/HistogramBead.cpp
+++ b/src/tools/HistogramBead.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/HistogramBead.h b/src/tools/HistogramBead.h
index aae33470c5695ff8970fcb1e4e7e7ba993fee40e..77956d3f9d7faee28a8f87ef3de9d089f552d45d 100644
--- a/src/tools/HistogramBead.h
+++ b/src/tools/HistogramBead.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/IFile.cpp b/src/tools/IFile.cpp
index 5cd32613500819de6d2b1eb46dbb0f76242c94f0..7259eec5ad385846fffa8a5887cd7289b0610ae2 100644
--- a/src/tools/IFile.cpp
+++ b/src/tools/IFile.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/IFile.h b/src/tools/IFile.h
index 2d54338df6f294c74d293e2e8ef23d2d802ac8d1..5c1f3406abec9f40809a2f3a0c4943953dc96d24 100644
--- a/src/tools/IFile.h
+++ b/src/tools/IFile.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/KernelFunctions.cpp b/src/tools/KernelFunctions.cpp
index d5da1a38729c10e456dea6a601dff2a275d4d912..38a0c60acd52b4cb1ab85200b40c3f21c0a70e93 100644
--- a/src/tools/KernelFunctions.cpp
+++ b/src/tools/KernelFunctions.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/KernelFunctions.h b/src/tools/KernelFunctions.h
index a7535e0b281655f194c593636bb3168553bf5967..81f656efc266eb03cb70af8ce3b81758190907b3 100644
--- a/src/tools/KernelFunctions.h
+++ b/src/tools/KernelFunctions.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Keywords.cpp b/src/tools/Keywords.cpp
index 7b7e36419c4eabf90f1e90101e7e10989a91941c..bfaadb82d3dfda775a28ef18d4c25802fb8fc19a 100644
--- a/src/tools/Keywords.cpp
+++ b/src/tools/Keywords.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Keywords.h b/src/tools/Keywords.h
index 7da2155f5e897f21ce1af01d25e6f840a1d45ebe..abcf450c5dbdf57ff98ffc2a0f87041a0e938027 100644
--- a/src/tools/Keywords.h
+++ b/src/tools/Keywords.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/LatticeReduction.cpp b/src/tools/LatticeReduction.cpp
index c0bc6b1d03697ec84ae09a702820f452b78ae648..faf36b45f24acc67b9bfeba8b2fce5a624aadc75 100644
--- a/src/tools/LatticeReduction.cpp
+++ b/src/tools/LatticeReduction.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/LatticeReduction.h b/src/tools/LatticeReduction.h
index 16d999a9c44ed6cdaf57ec19aef46948b946abe2..7f5c0e1497bb4122b9174f39fed00f9b57afdf95 100644
--- a/src/tools/LatticeReduction.h
+++ b/src/tools/LatticeReduction.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/LinkCells.cpp b/src/tools/LinkCells.cpp
index 324e0f80342d9248c9737eba6fe1bb5d783df3f9..8e3c3b7ae52a63d809ce4a4a9396d508917f5e88 100644
--- a/src/tools/LinkCells.cpp
+++ b/src/tools/LinkCells.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/LinkCells.h b/src/tools/LinkCells.h
index b493dbf87a1fa30880f180dc98b27fba8e98ac76..3dd54f1748f1b042a540acff275c737ee46d3d3d 100644
--- a/src/tools/LinkCells.h
+++ b/src/tools/LinkCells.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Log.h b/src/tools/Log.h
index c25ca3f383fdf5af261033a017048b4282344cac..4ac26c1b50296b410382bffdb1e42872f5a920a9 100644
--- a/src/tools/Log.h
+++ b/src/tools/Log.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/LoopUnroller.h b/src/tools/LoopUnroller.h
index 83f33ed700fb0c702ee05147b0d1591094aafc03..c1b4bb58d4ce31db7d21690ec7f4631628111e45 100644
--- a/src/tools/LoopUnroller.h
+++ b/src/tools/LoopUnroller.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Matrix.h b/src/tools/Matrix.h
index fd1e35d6d97011990191336740f1cc731b094897..61cc2a78345eec0aae978eecf742a4bc41f03453 100644
--- a/src/tools/Matrix.h
+++ b/src/tools/Matrix.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/MatrixSquareBracketsAccess.h b/src/tools/MatrixSquareBracketsAccess.h
index 1e8188bb32d80f1799a1f109608b08a5ee69c675..113497bceabe4f031fbb9a036caef5d6c0b14440 100644
--- a/src/tools/MatrixSquareBracketsAccess.h
+++ b/src/tools/MatrixSquareBracketsAccess.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Minimise1DBrent.h b/src/tools/Minimise1DBrent.h
index 097a05b4442c50c0f2c57813f826d97f7b838ec1..ef8862c5e651e89d19d861fc2629212fcd63d032 100644
--- a/src/tools/Minimise1DBrent.h
+++ b/src/tools/Minimise1DBrent.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/MinimiseBase.h b/src/tools/MinimiseBase.h
index 27714da7cafd4720533a8c00bf30aaa881ebb3f8..86cfcb4d0a0c1f2270e2b5746b79b48c583cddd7 100644
--- a/src/tools/MinimiseBase.h
+++ b/src/tools/MinimiseBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/MolDataClass.cpp b/src/tools/MolDataClass.cpp
index 310267d5ac75c49d448c7779eadf337b27db7f19..66f5f07a10a954b5dba4dc37df6076b8c5b2e507 100644
--- a/src/tools/MolDataClass.cpp
+++ b/src/tools/MolDataClass.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/MolDataClass.h b/src/tools/MolDataClass.h
index e3ee3233565d9774299fc8dcdd2d6e05220b27cd..655eb9357a92168e14da8af155e16fbb495507d7 100644
--- a/src/tools/MolDataClass.h
+++ b/src/tools/MolDataClass.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/NeighborList.h b/src/tools/NeighborList.h
index 5afa8721807fc920fcec9d6ae5c4ceafa5be1d04..12f86d9216d4afdf74d9cda474ff1ef23d25f0af 100644
--- a/src/tools/NeighborList.h
+++ b/src/tools/NeighborList.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/OFile.cpp b/src/tools/OFile.cpp
index 92108a132147f96b6a2455e4af77384030c43a13..0681444d103dc3d13a504a3284e65b44dd2df637 100644
--- a/src/tools/OFile.cpp
+++ b/src/tools/OFile.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/OFile.h b/src/tools/OFile.h
index 84f044a94ddd0d0bfa741c1db8383c8ec9795845..710ed976c051bf5f8469311dece6dd1ec1451a1f 100644
--- a/src/tools/OFile.h
+++ b/src/tools/OFile.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/OpenMP.cpp b/src/tools/OpenMP.cpp
index 928c3da156ba9d2295fc097feed2e7aa5fc178ca..e0a42d6a522ec4cd8070ec5eb961036d6a9b3967 100644
--- a/src/tools/OpenMP.cpp
+++ b/src/tools/OpenMP.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/OpenMP.h b/src/tools/OpenMP.h
index c79258ff76c8295384c19964a1a65dc2a03beba4..5b321752e8621c9bd62b61041241cad4fe2bfaed 100644
--- a/src/tools/OpenMP.h
+++ b/src/tools/OpenMP.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/RMSD.cpp b/src/tools/RMSD.cpp
index 0bc2eff54825e6363755466485806241ab223ef4..62ea6d745b2df9443dabe690dfda31f3617a81f8 100644
--- a/src/tools/RMSD.cpp
+++ b/src/tools/RMSD.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/RMSD.h b/src/tools/RMSD.h
index b7c80bfa4a3d870b8694be258cf377a93295393e..a7ec1928e34a0d3a224c2d2ad2c4b6eee79d4cfd 100644
--- a/src/tools/RMSD.h
+++ b/src/tools/RMSD.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Random.cpp b/src/tools/Random.cpp
index 7d03b9da3d6bc6d5198c52d88c08c8cb5d15bb7d..e180ed1527d0b5732e796ab91ccfd31c8f8077d9 100644
--- a/src/tools/Random.cpp
+++ b/src/tools/Random.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Random.h b/src/tools/Random.h
index 49e7a3b4426eeb42874d7a484ac5dceb2d1aa963..6a9836dd5dcf8345821ccce9d60d26517ce59018 100644
--- a/src/tools/Random.h
+++ b/src/tools/Random.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/RootFindingBase.h b/src/tools/RootFindingBase.h
index b7374556057ce6c23556666c9a1f4745f30c61a1..d1e786c42a4b0a878c369f32b91b8c123483b672 100644
--- a/src/tools/RootFindingBase.h
+++ b/src/tools/RootFindingBase.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/SwitchingFunction.cpp b/src/tools/SwitchingFunction.cpp
index fcbe3bb37fc15149527417ab7365ea35cccc6615..6eec6c985ea9455794ef0ffcd9cbb8536b3f1052 100644
--- a/src/tools/SwitchingFunction.cpp
+++ b/src/tools/SwitchingFunction.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/SwitchingFunction.h b/src/tools/SwitchingFunction.h
index 379280da4a79d0a2e402972503c3e8f2c41594f8..8add9db5000d7898f3ec01f6105a998293b5b98d 100644
--- a/src/tools/SwitchingFunction.h
+++ b/src/tools/SwitchingFunction.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Tensor.cpp b/src/tools/Tensor.cpp
index d063e28cf9cee2f8fec7325090a269cd26650e16..5b132af72e36902ca0d128a921d4b38dc75b695e 100644
--- a/src/tools/Tensor.cpp
+++ b/src/tools/Tensor.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Tensor.h b/src/tools/Tensor.h
index 7cd6515c860e57797c83b7db40a111c59f1d54b9..7987a6155e851654b6868276c7bec0e2bb377a29 100644
--- a/src/tools/Tensor.h
+++ b/src/tools/Tensor.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Torsion.cpp b/src/tools/Torsion.cpp
index 4464e1bd17e362b69da15f005031c7739988094b..76a88affe8cec172e7e129e2e55020ac1717c292 100644
--- a/src/tools/Torsion.cpp
+++ b/src/tools/Torsion.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Torsion.h b/src/tools/Torsion.h
index b898a99ccdd5adeecad0a99c5e35d7488445ca9a..770bb7b4787158d5dd40ce696191700ec81aa691 100644
--- a/src/tools/Torsion.h
+++ b/src/tools/Torsion.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Units.cpp b/src/tools/Units.cpp
index 48737c9d082778ce35ce89de4793f049419cc2e5..a0da2c1544317add646e11ea0c9f51813c83bed3 100644
--- a/src/tools/Units.cpp
+++ b/src/tools/Units.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Units.h b/src/tools/Units.h
index 12074cc211f55b7af562dcee322b1c35679ebc59..9aaca6c978e543d02ec7af0eb82851bd317dffd4 100644
--- a/src/tools/Units.h
+++ b/src/tools/Units.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Vector.cpp b/src/tools/Vector.cpp
index 8f2883acb89d5c8a2475e6883398685519f3feda..218d85457e94c6661b3369a3f1edc3b7fda47815 100644
--- a/src/tools/Vector.cpp
+++ b/src/tools/Vector.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/tools/Vector.h b/src/tools/Vector.h
index 133ff4a1942933c3b7312327eae189151c97e844..0163d1851ae59602705e3c74b3871ee7c76cfc29 100644
--- a/src/tools/Vector.h
+++ b/src/tools/Vector.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vatom/ActionWithVirtualAtom.h b/src/vatom/ActionWithVirtualAtom.h
index d461218ab45a67a7d1edac0e61cd53b3d90340dd..d18e280bb6de090351c5900ed7f04d477d8b709b 100644
--- a/src/vatom/ActionWithVirtualAtom.h
+++ b/src/vatom/ActionWithVirtualAtom.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vatom/COM.cpp b/src/vatom/COM.cpp
index d0cfd0b1feffc1f163e57309aca191192d738157..9e9ac4890c41a0b3ca94619586f085f5a394a8a7 100644
--- a/src/vatom/COM.cpp
+++ b/src/vatom/COM.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vatom/Center.cpp b/src/vatom/Center.cpp
index 64eea7d7419381476acfa879d1640cd38fdc8d79..5201e470042162dc89223d2b7e360d50ce1b2b3f 100644
--- a/src/vatom/Center.cpp
+++ b/src/vatom/Center.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vatom/FixedAtom.cpp b/src/vatom/FixedAtom.cpp
index 3baf40379a1c7c7f271c33e5563d16d7878ff8c6..87a3aa2dc6b349663469b2cca3be30ab276838a0 100644
--- a/src/vatom/FixedAtom.cpp
+++ b/src/vatom/FixedAtom.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vatom/Ghost.cpp b/src/vatom/Ghost.cpp
index 7c57cee4ffad29f228ab766fd241a685065e0134..435b54cb8e54b1516ef66b9486c66f650f2b8230 100644
--- a/src/vatom/Ghost.cpp
+++ b/src/vatom/Ghost.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ActionWithAveraging.cpp b/src/vesselbase/ActionWithAveraging.cpp
index a470f6f5f8b0291408a3c4ee67c08fa7e53a36f0..a114cf7b19de2ebcb13531caa3de611665a0fdba 100644
--- a/src/vesselbase/ActionWithAveraging.cpp
+++ b/src/vesselbase/ActionWithAveraging.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ActionWithAveraging.h b/src/vesselbase/ActionWithAveraging.h
index 62b5642fb603972f0f7dd1a4ed37dc5c05633eed..f9a7bbe3d15ba40df61ca284fff602328d1eb83d 100644
--- a/src/vesselbase/ActionWithAveraging.h
+++ b/src/vesselbase/ActionWithAveraging.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ActionWithInputVessel.cpp b/src/vesselbase/ActionWithInputVessel.cpp
index b75c1f4a0bf455b2d663a1b124d765b2ce8d68cb..711c8143a851e84a1fcf560238be89813591f46f 100644
--- a/src/vesselbase/ActionWithInputVessel.cpp
+++ b/src/vesselbase/ActionWithInputVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ActionWithInputVessel.h b/src/vesselbase/ActionWithInputVessel.h
index 09d888f45f9712f13d3514b57245ead28645ac51..dc20e9af1694a10f7732ba54da21977536f624ab 100644
--- a/src/vesselbase/ActionWithInputVessel.h
+++ b/src/vesselbase/ActionWithInputVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2014-2016 The plumed team
+   Copyright (c) 2014-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ActionWithVessel.cpp b/src/vesselbase/ActionWithVessel.cpp
index ebbe511a4fe9ca2994e2a38c1738ca22105c1d83..58cbf84dac465228a3940b55fce3b14278514ac1 100644
--- a/src/vesselbase/ActionWithVessel.cpp
+++ b/src/vesselbase/ActionWithVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ActionWithVessel.h b/src/vesselbase/ActionWithVessel.h
index 81340376496e1df4b81882e701a0c1216fbc77d4..5d49bebecf5091dfe9faf634749d942a21044743 100644
--- a/src/vesselbase/ActionWithVessel.h
+++ b/src/vesselbase/ActionWithVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/AltMin.cpp b/src/vesselbase/AltMin.cpp
index 7dfa034d6a8bbcccd90e6d496402b0b39d1f3175..202bb849e4fd852d235f60395dd5b8170f6770d5 100644
--- a/src/vesselbase/AltMin.cpp
+++ b/src/vesselbase/AltMin.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/AveragingVessel.cpp b/src/vesselbase/AveragingVessel.cpp
index a3bbb4fd7965ae8dd21db8f1fcd05fdf1c4a1a8b..f44d22b242cacce6f73c520e5ebf42e547e22b3b 100644
--- a/src/vesselbase/AveragingVessel.cpp
+++ b/src/vesselbase/AveragingVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/AveragingVessel.h b/src/vesselbase/AveragingVessel.h
index ad9bb4cb4b316426e1f71b9f48d30d8d58e8e0d2..141a35e370c2c7931ccf7b014c0a23fe2398319a 100644
--- a/src/vesselbase/AveragingVessel.h
+++ b/src/vesselbase/AveragingVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2016 The plumed team
+   Copyright (c) 2016,2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Between.cpp b/src/vesselbase/Between.cpp
index ac02823d0f0399573a1f3ee342234d371fb6a31f..68be61205eb0557179427054ab930fe51d9e27f8 100644
--- a/src/vesselbase/Between.cpp
+++ b/src/vesselbase/Between.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/FunctionVessel.cpp b/src/vesselbase/FunctionVessel.cpp
index 13b84e615646a4de5ade1375da63d32268cb747c..ca241a4e1839e6f6335f85d14631b07d02d65251 100644
--- a/src/vesselbase/FunctionVessel.cpp
+++ b/src/vesselbase/FunctionVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/FunctionVessel.h b/src/vesselbase/FunctionVessel.h
index b6fd05d559ab20591e48e68db7bf51c938c06e13..729b86ffb1a2648c7fcdf3dd2351eeb078934761 100644
--- a/src/vesselbase/FunctionVessel.h
+++ b/src/vesselbase/FunctionVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Highest.cpp b/src/vesselbase/Highest.cpp
index 437f681ec75d916cf07c5fc3c87fb1cdda3e50b7..6cb28e8e068284f1d21317f842b7ae125d01fba9 100644
--- a/src/vesselbase/Highest.cpp
+++ b/src/vesselbase/Highest.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Histogram.cpp b/src/vesselbase/Histogram.cpp
index eb91f0ce2ab7f75c6e9a5fa460997c8b7bf789b2..1ba33cdcda22f9ee88388839cdfcecad7edc5334 100644
--- a/src/vesselbase/Histogram.cpp
+++ b/src/vesselbase/Histogram.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/LessThan.cpp b/src/vesselbase/LessThan.cpp
index 7d1c69c71c30a1cd29a88bc401438d7f484c5a9c..fa51e4f084e5d440864091d729e786cb2cb3465d 100644
--- a/src/vesselbase/LessThan.cpp
+++ b/src/vesselbase/LessThan.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/LessThan.h b/src/vesselbase/LessThan.h
index f276f6e4a70a81f2b45bf432af6f86c21527c45a..28ac4b147cfa853fce40040162f6a2c364749e14 100644
--- a/src/vesselbase/LessThan.h
+++ b/src/vesselbase/LessThan.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Lowest.cpp b/src/vesselbase/Lowest.cpp
index 9121543b787110156bf6a67ae0cf57f4f4228d26..62bf667ed74847156bdb106c81d66402471ca620 100644
--- a/src/vesselbase/Lowest.cpp
+++ b/src/vesselbase/Lowest.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Max.cpp b/src/vesselbase/Max.cpp
index d9b7b2c5a63b242ec5a4c24606949f0ba3cad1d6..d114c28677609242c820cf6396d3cd92fb5b0d45 100644
--- a/src/vesselbase/Max.cpp
+++ b/src/vesselbase/Max.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Mean.cpp b/src/vesselbase/Mean.cpp
index d2979761b9c160eb506bca5960205ff78b1fca57..d84852732d83a8e5623e38de0f59462043fd9070 100644
--- a/src/vesselbase/Mean.cpp
+++ b/src/vesselbase/Mean.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Min.cpp b/src/vesselbase/Min.cpp
index 989ee34c61ec355d358aef3ed0afe485ed2d375f..5eb6750556b8021821550fa805c63c3c7f9f1ccf 100644
--- a/src/vesselbase/Min.cpp
+++ b/src/vesselbase/Min.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Moments.cpp b/src/vesselbase/Moments.cpp
index 84d7e3919069c3b51b9d672c56f5c0479ec9de8d..3d400ebfb2a76e2821404f3aba91f8e3e40a1fe5 100644
--- a/src/vesselbase/Moments.cpp
+++ b/src/vesselbase/Moments.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/MoreThan.cpp b/src/vesselbase/MoreThan.cpp
index 6a98e3baecab7ba24598ad417f63943df6f835c5..59cfe5b2c96a98483a2ab58adebc5a49e0c0d080 100644
--- a/src/vesselbase/MoreThan.cpp
+++ b/src/vesselbase/MoreThan.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/OrderingVessel.cpp b/src/vesselbase/OrderingVessel.cpp
index 4eab91788786dd3a8ff6edd95f42439eb9276e57..1af3ead4d6844f00af4c09fe1f3f28fadb1fe625 100644
--- a/src/vesselbase/OrderingVessel.cpp
+++ b/src/vesselbase/OrderingVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/OrderingVessel.h b/src/vesselbase/OrderingVessel.h
index 6e8fb93cc59ae9ebcf3cdcd0969815cf00c29783..45396ef48d9d4a8749c0e863b94fc58d993565d9 100644
--- a/src/vesselbase/OrderingVessel.h
+++ b/src/vesselbase/OrderingVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ShortcutVessel.cpp b/src/vesselbase/ShortcutVessel.cpp
index fc3be38c6ff62ec6da45f204e77c7bf3fe52f2bf..cda075fcf48e77d0548b8a149c3f33f33d69cc18 100644
--- a/src/vesselbase/ShortcutVessel.cpp
+++ b/src/vesselbase/ShortcutVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ShortcutVessel.h b/src/vesselbase/ShortcutVessel.h
index c6e66d76cfd7277a1091591384511831956cadf9..7cea470b13494c67a0736afc8987bc83b4705161 100644
--- a/src/vesselbase/ShortcutVessel.h
+++ b/src/vesselbase/ShortcutVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/StoreDataVessel.cpp b/src/vesselbase/StoreDataVessel.cpp
index 72c831290fd15d2d7241c10e7763702d5a4b5ebd..7bdab47fb805edab2382aee5ea941d5814ddea47 100644
--- a/src/vesselbase/StoreDataVessel.cpp
+++ b/src/vesselbase/StoreDataVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/StoreDataVessel.h b/src/vesselbase/StoreDataVessel.h
index 1b8fafef46742c82a2317b451ee8e844696064db..954cdb7b1dafcb56dbcc4603fbff180eef325ab3 100644
--- a/src/vesselbase/StoreDataVessel.h
+++ b/src/vesselbase/StoreDataVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2013-2016 The plumed team
+   Copyright (c) 2013-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Sum.cpp b/src/vesselbase/Sum.cpp
index 4a1aedd5a428572b38ad96e460e956e90dd21dd7..bd3fdba11c1802e71c34f7282e6f4728288137ae 100644
--- a/src/vesselbase/Sum.cpp
+++ b/src/vesselbase/Sum.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ValueVessel.cpp b/src/vesselbase/ValueVessel.cpp
index a234ffe1746a0116846ee1a153f438112c53f707..8c916e9b0a9bfd174dca3953445438c26a0e4e0c 100644
--- a/src/vesselbase/ValueVessel.cpp
+++ b/src/vesselbase/ValueVessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2015,2016 The plumed team
+   Copyright (c) 2015-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/ValueVessel.h b/src/vesselbase/ValueVessel.h
index b805204199400a343bd3471277edc985065e26f1..b5fe67ef510166dd0298d330b40a053842aab045 100644
--- a/src/vesselbase/ValueVessel.h
+++ b/src/vesselbase/ValueVessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Vessel.cpp b/src/vesselbase/Vessel.cpp
index 4ce9e10a0503a959cf705d11c953e43a114f1fb9..31fab043b594bf3b1f6384ac3c978b495f547c67 100644
--- a/src/vesselbase/Vessel.cpp
+++ b/src/vesselbase/Vessel.cpp
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/Vessel.h b/src/vesselbase/Vessel.h
index ab96f3f41af95fa4ce7db53290570a6b74e7d323..ebfa475b7089d7e88c50e447d8e283c28301d4a7 100644
--- a/src/vesselbase/Vessel.h
+++ b/src/vesselbase/Vessel.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/vesselbase/VesselRegister.h b/src/vesselbase/VesselRegister.h
index a2bd24a20c42fd7ae5192c6309730fea8d32cf75..b7bbd37b640e0707e87a33f2c13d949076f1a503 100644
--- a/src/vesselbase/VesselRegister.h
+++ b/src/vesselbase/VesselRegister.h
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2012-2016 The plumed team
+   Copyright (c) 2012-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/src/wrapper/Plumed.c b/src/wrapper/Plumed.c
index 75d9a9280bb69e4f828c0f744550273f4c65d1c1..2976d3de51caf3615b510a102e0418c6dbbafc93 100644
--- a/src/wrapper/Plumed.c
+++ b/src/wrapper/Plumed.c
@@ -1,5 +1,5 @@
 /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   Copyright (c) 2011-2016 The plumed team
+   Copyright (c) 2011-2017 The plumed team
    (see the PEOPLE file at the root of the distribution for a list of names)
 
    See http://www.plumed.org for more information.
diff --git a/user-doc/Installation.txt b/user-doc/Installation.txt
index 7d9a91cfbec937ffe679055a57cfdadbb69c4016..1179cac28430f895fd321097d4da4c24d06542eb 100644
--- a/user-doc/Installation.txt
+++ b/user-doc/Installation.txt
@@ -271,6 +271,23 @@ in the configuration file.
   -DF77_NO_UNDERSCORE to CPPFLAGS
   Notice that "./configure" should automatically try this solution.
 
+\subsection installation-vmdplugins VMD trajectory plugins
+
+If you configure PLUMED with VMD's plugins you will be able to read
+many more trajectory formats. To this aim,
+you need to download the SOURCE of VMD, which contains
+a plugins directory. Adapt build.sh and compile it. At
+the end, you should get the molfile plugins compiled as a static
+library `libmolfile_plugin.a`. Locate said file and `libmolfile_plugin.h`,
+and customize the configure command with something along
+the lines of:
+
+\verbatim
+./configure LDFLAGS="-ltcl8.5 -L/mypathtomolfilelibrary/ -L/mypathtotcl" CPPFLAGS="-I/mypathtolibmolfile_plugin.h/"
+\endverbatim
+
+and rebuild.
+
 \section CompilingPlumed Compiling PLUMED
 
 Once configured, PLUMED can be compiled using the following command:
@@ -455,12 +472,12 @@ There are different options available when patching. You can check all of them u
 > plumed patch --help
 \endverbatim
 Particularly interesting options include:
-- --static (default) just link PLUMED as a collection of object files. This is only suggested if for external reasons you
+- --static just link PLUMED as a collection of object files. This is only suggested if for external reasons you
   absolutely need a static executable. Notice that with this setting it is often more complicated to configure
   properly the MD code, since all the libraries that PLUMED depends on should be properly specified. The `./configure` script
   does its best in this sense, but sometime it cannot solve the problem. Additionally, this patching mode has been reported
   not to work properly on OSX.
-- --shared allows you to link PLUMED as a shared library. As a result when PLUMED is updated, there will be no need to recompile the MD code.
+- --shared (default) allows you to link PLUMED as a shared library. As a result when PLUMED is updated, there will be no need to recompile the MD code.
   This is way better than --static since the libraries that PLUMED depends on should be automatically linked.
   Notice that if you later remove the directory where PLUMED is installed also the MD code will not run anymore.
 - --runtime allows you to choose the location of the PLUMED library at runtime by setting the variable PLUMED_KERNEL.
diff --git a/user-doc/Regex.txt b/user-doc/Regex.txt
index 93561f632200703b840f5a97f9f5530691341fdb..11999b58215c9aa520117dd9a3c338233287c7d3 100644
--- a/user-doc/Regex.txt
+++ b/user-doc/Regex.txt
@@ -2,8 +2,9 @@
 
 \page Regex Regular Expressions
 
-When you use a collective variable that has many calculated components and you want to 
-refer to them as arguments you can use regular expressions.
+When you use need to pass many arguments to a PLUMED action, being them
+components of a few collective variables or also multiple collective variables,
+you might find it convenient to use [regular expressions](https://en.wikipedia.org/wiki/Regular_expression).
 
 Since version 2.1, plumed takes advantage of a configuration scripts that
 detects libraries installed on your system. If regex library is found,
@@ -13,13 +14,17 @@ or function names.
 Regular expressions are enclosed in round braces and must not contain spaces (the components 
 names have no spaces indeed, so why use them?).
 
-As an example then command
+As an example the command:
 \plumedfile
 d1: DISTANCE ATOMS=1,2 COMPONENTS
 PRINT ARG=(d1\.[xy])   STRIDE=100 FILE=colvar FMT=%8.4f
 \endplumedfile
-will cause both the d1.x and d1.y components of the DISTANCE action to be printed out in the order that they are created by plumed.
-The "." character must be escaped in order to interpret it as a literal ".". An unescaped dot is a wildcard which is matched by any character,
+will cause both the d1.x and d1.y components of the DISTANCE action to be printed.
+
+Notice that selection does not happen in alphabetic order, nor in the order in which `[xy]` are listed, but rather in the order in which
+the two variables have been created by PLUMED.
+Also notice that the
+`.` character must be escaped as `\.` in order to interpret it as a literal `.`. An unescaped dot is a wildcard which is matched by any character,
 So as an example
 \plumedfile
 d1: DISTANCE ATOMS=1,2 COMPONENTS
@@ -32,27 +37,47 @@ PRINT ARG=(d1.[xy])   STRIDE=100 FILE=colvar FMT=%8.4f
 PRINT ARG=(d1\.[xy])   STRIDE=100 FILE=colvar FMT=%8.4f
 \endplumedfile
 
-You can include more than one regular expression by using comma separated regular expressions 
-
+You can concatenate more than one regular expression by using comma separated regular expressions.
+The resulting matches will be concatenated:
 \plumedfile
 t1: TORSION ATOMS=5,7,9,15
 t2: TORSION ATOMS=7,9,15,17
 d1: DISTANCE ATOMS=7,17 COMPONENTS
+
+# The first expression matches d1.x and d1.y
+# The second expression matches t1 and t2
 PRINT ARG=(d1\.[xy]),(t[0-9]) STRIDE=100 FILE=colvar FMT=%8.4f
+# Thus this is the same as ARG=d1.x,d1.y,t1,t2
 \endplumedfile
 
-(this selects t1,t2,d1.x and d2.x) Be aware that if you have overlapping selection they will be duplicated so it 
-a better alternative is to use the "or" operator "|". 
-
+Be aware that if you have overlapping selections they will be duplicated.
+As an alternative you could use the "or" operator `|`:
 \plumedfile
 t1: TORSION ATOMS=5,7,9,15
 t2: TORSION ATOMS=7,9,15,17
 d1: DISTANCE ATOMS=7,17 COMPONENTS
+
+# Here is a single regular expression
 PRINT ARG=(d1\.[xy]|t[0-9]) STRIDE=100 FILE=colvar FMT=%8.4f
+# Thus this is the same as ARG=t1,t2,d1.x,d1.y
 \endplumedfile
 
 this selects the same set of arguments as the previous example.
 
+\note
+Be careful you do not confuse regular expressions, which are triggered by the parethesis `()` and only available when
+PLUMED has been compiled with the regex library, with the capability of PLUMED to use `*` as a wildcard in arguments:
+\plumedfile
+d1: DISTANCE ATOMS=1,2 COMPONENTS
+# this is a regular expression that selects all components of d1
+# i.e. d1.x d1.y and d1.z
+PRINT ARG=(d1\..*)   STRIDE=100 FILE=colvar_reg FMT=%8.4f
+
+# this is a wildcard that selects all the components of d1 as well
+PRINT ARG=d1.*   STRIDE=100 FILE=colvar_wild FMT=%8.4f
+\endplumedfile
+Regular expressions are way more flexible than wildcards!
+
 You can check the log to see whether or not your regular expression is picking the set of components you desire.
 
 For more information on regular expressions visit http://www.regular-expressions.info/reference.html.