diff --git a/matlab/@dynDate/colon.m b/matlab/@dynDate/colon.m
index cb499d8a5..69742ea15 100644
--- a/matlab/@dynDate/colon.m
+++ b/matlab/@dynDate/colon.m
@@ -31,7 +31,6 @@ function sp = colon(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -48,6 +47,8 @@ function sp = colon(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if nargin~=2
     error('dynTime::colon: I need exactly two input arguments!')
 end
diff --git a/matlab/@dynDate/dynDate.m b/matlab/@dynDate/dynDate.m
index 524bcaa6a..25e8dc3b3 100644
--- a/matlab/@dynDate/dynDate.m
+++ b/matlab/@dynDate/dynDate.m
@@ -44,7 +44,6 @@ function date = dynDate(a)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -61,6 +60,8 @@ function date = dynDate(a)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 date = struct;
 
 date.freq = NaN;
diff --git a/matlab/@dynDate/eq.m b/matlab/@dynDate/eq.m
index e699b1761..186dd0b7f 100644
--- a/matlab/@dynDate/eq.m
+++ b/matlab/@dynDate/eq.m
@@ -30,7 +30,6 @@ function c = eq(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -47,6 +46,8 @@ function c = eq(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 verbose = 0;
 
 if nargin~=2
diff --git a/matlab/@dynDate/format.m b/matlab/@dynDate/format.m
index d308a6f0e..494dfda8d 100644
--- a/matlab/@dynDate/format.m
+++ b/matlab/@dynDate/format.m
@@ -28,7 +28,6 @@ function p = format(date)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -45,6 +44,8 @@ function p = format(date)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 
 if nargin~=1
     error('dynDate::format: I need exactly one input argument!')
diff --git a/matlab/@dynDate/ge.m b/matlab/@dynDate/ge.m
index 7c2f8ab3f..2be9bb485 100644
--- a/matlab/@dynDate/ge.m
+++ b/matlab/@dynDate/ge.m
@@ -31,7 +31,6 @@ function c = ge(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -48,6 +47,8 @@ function c = ge(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if a>b
     c=1;
 else
diff --git a/matlab/@dynDate/gt.m b/matlab/@dynDate/gt.m
index 65b9ca4bc..5d6ed5e72 100644
--- a/matlab/@dynDate/gt.m
+++ b/matlab/@dynDate/gt.m
@@ -30,7 +30,6 @@ function c = gt(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -47,6 +46,8 @@ function c = gt(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 verbose = 0;
 
 if nargin~=2
diff --git a/matlab/@dynDate/le.m b/matlab/@dynDate/le.m
index 8d7784535..6fd1026c4 100644
--- a/matlab/@dynDate/le.m
+++ b/matlab/@dynDate/le.m
@@ -31,7 +31,6 @@ function c = le(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -48,6 +47,8 @@ function c = le(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if a<b
     c=1;
 else
diff --git a/matlab/@dynDate/lt.m b/matlab/@dynDate/lt.m
index ebd0995ce..84aa32967 100644
--- a/matlab/@dynDate/lt.m
+++ b/matlab/@dynDate/lt.m
@@ -30,7 +30,6 @@ function c = lt(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -47,6 +46,8 @@ function c = lt(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 verbose = 0;
 
 if nargin~=2
diff --git a/matlab/@dynDate/max.m b/matlab/@dynDate/max.m
index cab6b38bc..74bcfb1b0 100644
--- a/matlab/@dynDate/max.m
+++ b/matlab/@dynDate/max.m
@@ -30,7 +30,6 @@ function c = max(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -47,6 +46,8 @@ function c = max(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 verbose = 0;
 
 if nargin~=2
diff --git a/matlab/@dynDate/min.m b/matlab/@dynDate/min.m
index cb006327a..df51fb201 100644
--- a/matlab/@dynDate/min.m
+++ b/matlab/@dynDate/min.m
@@ -30,7 +30,6 @@ function c = min(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -47,6 +46,8 @@ function c = min(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 verbose = 0;
 
 if nargin~=2
diff --git a/matlab/@dynDate/minus.m b/matlab/@dynDate/minus.m
index fa3d1a9cf..a037f0aee 100644
--- a/matlab/@dynDate/minus.m
+++ b/matlab/@dynDate/minus.m
@@ -32,7 +32,6 @@ function c = minus(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -49,6 +48,8 @@ function c = minus(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if ~( isa(a,'dynDate') && isa(b,'dynDate') )
     error(['dynDate::minus: Input arguments ' inputname(1) ' and ' inputname(2) ' must be dynDate objects!'])
 end
diff --git a/matlab/@dynDate/ne.m b/matlab/@dynDate/ne.m
index d639ef3dc..c00cc2283 100644
--- a/matlab/@dynDate/ne.m
+++ b/matlab/@dynDate/ne.m
@@ -30,7 +30,6 @@ function c = ne(a,b)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -47,6 +46,8 @@ function c = ne(a,b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 verbose = 0;
 
 if nargin~=2
diff --git a/matlab/@dynDate/subsref.m b/matlab/@dynDate/subsref.m
index b57b7e7c1..4a951dfe0 100644
--- a/matlab/@dynDate/subsref.m
+++ b/matlab/@dynDate/subsref.m
@@ -33,7 +33,6 @@ function B = subsref(A,S)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -50,4 +49,6 @@ function B = subsref(A,S)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 B = builtin('subsref', A, S);
\ No newline at end of file
diff --git a/matlab/@dynDate/uminus.m b/matlab/@dynDate/uminus.m
index 7b66f3322..56d677a39 100644
--- a/matlab/@dynDate/uminus.m
+++ b/matlab/@dynDate/uminus.m
@@ -30,7 +30,6 @@ function b = uminus(a)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -47,6 +46,8 @@ function b = uminus(a)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if ~isa(a,'dynDate')
     error(['dynDate::uminus: Input argument ' inputname(1) ' must be a dynDate object.'])
 end
diff --git a/matlab/@dynDate/uplus.m b/matlab/@dynDate/uplus.m
index 14da6a503..11d2c9559 100644
--- a/matlab/@dynDate/uplus.m
+++ b/matlab/@dynDate/uplus.m
@@ -30,7 +30,6 @@ function b = uplus(a)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -47,6 +46,8 @@ function b = uplus(a)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if ~isa(a,'dynDate')
     error(['dynDate::uplus: Input argument ' inputname(1) ' must be a dynDate object.'])
 end
diff --git a/matlab/@dynDates/subsref.m b/matlab/@dynDates/subsref.m
index b5408de77..e267e9af4 100644
--- a/matlab/@dynDates/subsref.m
+++ b/matlab/@dynDates/subsref.m
@@ -33,7 +33,6 @@ function B = subsref(A,S)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -50,6 +49,8 @@ function B = subsref(A,S)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 B = builtin('subsref', A, S);
 
 if isequal(S(1).type,'.')
diff --git a/matlab/@dynSeries/horzcat.m b/matlab/@dynSeries/horzcat.m
index 1748e18f0..3adeec1e9 100644
--- a/matlab/@dynSeries/horzcat.m
+++ b/matlab/@dynSeries/horzcat.m
@@ -40,7 +40,6 @@ function a = horzcat(varargin)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -57,6 +56,8 @@ function a = horzcat(varargin)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if nargin==0 || nargin==1
     error('dynSeries::horzcat: I need at least two input arguments!')
 end
diff --git a/matlab/@dynTime/dynTime.m b/matlab/@dynTime/dynTime.m
index 3d885db78..021ac93fe 100644
--- a/matlab/@dynTime/dynTime.m
+++ b/matlab/@dynTime/dynTime.m
@@ -42,7 +42,6 @@ function sp = dynTime(a)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -59,6 +58,8 @@ function sp = dynTime(a)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 sp = struct;
 
 sp.freq = [];
diff --git a/matlab/cartesian_product_of_sets.m b/matlab/cartesian_product_of_sets.m
index 1368f8e28..8781a7e60 100644
--- a/matlab/cartesian_product_of_sets.m
+++ b/matlab/cartesian_product_of_sets.m
@@ -32,7 +32,6 @@ function cprod = cartesian_product_of_sets(varargin)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -49,6 +48,8 @@ function cprod = cartesian_product_of_sets(varargin)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 [ F{1:nargin} ] = ndgrid( varargin{:} );
 
 for i=1:nargin
diff --git a/matlab/gauss_hermite_weights_and_nodes.m b/matlab/gauss_hermite_weights_and_nodes.m
index 5946ac25e..40287cb71 100644
--- a/matlab/gauss_hermite_weights_and_nodes.m
+++ b/matlab/gauss_hermite_weights_and_nodes.m
@@ -32,7 +32,6 @@ function [nodes,weights] = gauss_hermite_weights_and_nodes(n)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -49,6 +48,8 @@ function [nodes,weights] = gauss_hermite_weights_and_nodes(n)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 b = sqrt([1:n-1]/2);
 JacobiMatrix = diag(b,1)+diag(b,-1);
 [JacobiEigenVectors,JacobiEigenValues] = eig(JacobiMatrix);
diff --git a/matlab/kronecker/A_times_B_kronecker_C.m b/matlab/kronecker/A_times_B_kronecker_C.m
index dad073c34..e46306f0f 100644
--- a/matlab/kronecker/A_times_B_kronecker_C.m
+++ b/matlab/kronecker/A_times_B_kronecker_C.m
@@ -44,7 +44,6 @@ function [D, err] = A_times_B_kronecker_C(A,B,C,fake)
 %@eod:
 
 % Copyright (C) 1996-2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -61,6 +60,8 @@ function [D, err] = A_times_B_kronecker_C(A,B,C,fake)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 % Chek number of inputs and outputs.
 if nargin>4 || nargin<3
     error('A_times_B_kronecker_C takes 3 or 4 input arguments and provides 2 output arguments.')
diff --git a/matlab/kronecker/sparse_hessian_times_B_kronecker_C.m b/matlab/kronecker/sparse_hessian_times_B_kronecker_C.m
index fffe80646..09be1b7f9 100644
--- a/matlab/kronecker/sparse_hessian_times_B_kronecker_C.m
+++ b/matlab/kronecker/sparse_hessian_times_B_kronecker_C.m
@@ -46,7 +46,6 @@ function [D, err] = sparse_hessian_times_B_kronecker_C(varargin)
 %@eod:
 
 % Copyright (C) 1996-2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -63,6 +62,8 @@ function [D, err] = sparse_hessian_times_B_kronecker_C(varargin)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 A = varargin{1};
 B = varargin{2};
 C = varargin{3};
diff --git a/matlab/simul_backward_nonlinear_model.m b/matlab/simul_backward_nonlinear_model.m
index 80dec87a2..cafd3b612 100644
--- a/matlab/simul_backward_nonlinear_model.m
+++ b/matlab/simul_backward_nonlinear_model.m
@@ -35,7 +35,6 @@ function DynareOutput = simul_backward_nonlinear_model(sample_size,DynareOptions
 %@eod:
 
 % Copyright (C) 2012 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -52,6 +51,8 @@ function DynareOutput = simul_backward_nonlinear_model(sample_size,DynareOptions
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if DynareModel.maximum_lead
     error(['simul_backward_nonlinear_model:: The specified model is not backward looking!'])
 end
diff --git a/matlab/utilities/dataset/compute_acov.m b/matlab/utilities/dataset/compute_acov.m
index 8e3bec348..a67f24e48 100644
--- a/matlab/utilities/dataset/compute_acov.m
+++ b/matlab/utilities/dataset/compute_acov.m
@@ -37,7 +37,6 @@ function dataset_ = compute_acov(dataset_)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -54,6 +53,8 @@ function dataset_ = compute_acov(dataset_)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if ~isfield(dataset_.descriptive,'cova')
     dataset_ = compute_cova(dataset_);
 end
diff --git a/matlab/utilities/dataset/compute_corr.m b/matlab/utilities/dataset/compute_corr.m
index 3d56adb3b..d4a81dc07 100644
--- a/matlab/utilities/dataset/compute_corr.m
+++ b/matlab/utilities/dataset/compute_corr.m
@@ -34,7 +34,6 @@ function dataset_ = compute_corr(dataset_)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -51,6 +50,8 @@ function dataset_ = compute_corr(dataset_)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if ~isfield(dataset_.descriptive,'cova')
     dataset_ = compute_cova(dataset_);
 end
diff --git a/matlab/utilities/dataset/compute_cova.m b/matlab/utilities/dataset/compute_cova.m
index 12e5cb18a..cde46848f 100644
--- a/matlab/utilities/dataset/compute_cova.m
+++ b/matlab/utilities/dataset/compute_cova.m
@@ -31,7 +31,6 @@ function dataset_ = compute_cova(dataset_)
 %@eod:
     
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -48,6 +47,8 @@ function dataset_ = compute_cova(dataset_)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 dataset_.descriptive.cova = zeros(dataset_.nvobs);
 
 data = transpose(dataset_.data);
diff --git a/matlab/utilities/dataset/compute_stdv.m b/matlab/utilities/dataset/compute_stdv.m
index 2111e0056..2ddbbfc01 100644
--- a/matlab/utilities/dataset/compute_stdv.m
+++ b/matlab/utilities/dataset/compute_stdv.m
@@ -31,7 +31,6 @@ function dataset_ = compute_stdv(dataset_)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -48,6 +47,8 @@ function dataset_ = compute_stdv(dataset_)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if dataset_.missing.state
     dataset_.descriptive.stdv = sqrt(nanmean(bsxfun(@power,nandemean(transpose(dataset_.data)),2)));
 else
diff --git a/matlab/utilities/dataset/describe_missing_data.m b/matlab/utilities/dataset/describe_missing_data.m
index b1fbb2c9f..421e64d83 100644
--- a/matlab/utilities/dataset/describe_missing_data.m
+++ b/matlab/utilities/dataset/describe_missing_data.m
@@ -28,7 +28,6 @@ function [i,n,s,j] = describe_missing_data(data)
 %@eod:
     
 % Copyright (C) 2008-2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -45,6 +44,8 @@ function [i,n,s,j] = describe_missing_data(data)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 [observation_index,variable_index] = find(~isnan(data));
 [T,N] = size(data);
 
diff --git a/matlab/utilities/dataset/descriptive_statistics.m b/matlab/utilities/dataset/descriptive_statistics.m
index 06afbdf40..35981246e 100644
--- a/matlab/utilities/dataset/descriptive_statistics.m
+++ b/matlab/utilities/dataset/descriptive_statistics.m
@@ -46,7 +46,6 @@ function dataset_ = descriptive_statistics(dataset_,statistic,varagin)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -63,6 +62,8 @@ function dataset_ = descriptive_statistics(dataset_,statistic,varagin)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 
 if strcmpi(statistic,'stdv')
     dataset_ = compute_std(dataset_)
diff --git a/matlab/utilities/dataset/initialize_dataset.m b/matlab/utilities/dataset/initialize_dataset.m
index a860cae7e..b69d5b4ac 100644
--- a/matlab/utilities/dataset/initialize_dataset.m
+++ b/matlab/utilities/dataset/initialize_dataset.m
@@ -2,7 +2,6 @@ function dataset_ = initialize_dataset(datafile,varobs,first,nobs,transformation
 % Initializes a structure describing the dataset.
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -19,6 +18,8 @@ function dataset_ = initialize_dataset(datafile,varobs,first,nobs,transformation
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if isempty(datafile)
     error('Estimation:: You have to declare a dataset file!')
 end
diff --git a/matlab/utilities/doc/dynInfo.m b/matlab/utilities/doc/dynInfo.m
index 61fa9021b..c52e8efce 100644
--- a/matlab/utilities/doc/dynInfo.m
+++ b/matlab/utilities/doc/dynInfo.m
@@ -32,7 +32,6 @@ function dynInfo(fun)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -49,6 +48,8 @@ function dynInfo(fun)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if isempty(strfind(fun,'@')) & (~isempty(strfind(fun,'/')) || ~isempty(strfind(fun,'\')) )
     [pathstr1, name, ext] = fileparts(fun);
     addpath(pathstr1);
diff --git a/matlab/utilities/doc/get_internal_doc_block.m b/matlab/utilities/doc/get_internal_doc_block.m
index 65303de6e..d965500fe 100644
--- a/matlab/utilities/doc/get_internal_doc_block.m
+++ b/matlab/utilities/doc/get_internal_doc_block.m
@@ -2,7 +2,6 @@ function block = get_internal_doc_block(fname,fpath)
 % Extract doc sections from matlab's routine.
  
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -19,6 +18,8 @@ function block = get_internal_doc_block(fname,fpath)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 % Default output
 block = [];
     
diff --git a/matlab/utilities/general/demean.m b/matlab/utilities/general/demean.m
index cfa386f5f..332ab100d 100644
--- a/matlab/utilities/general/demean.m
+++ b/matlab/utilities/general/demean.m
@@ -28,7 +28,6 @@ function c = demean(x)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT ens DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -44,6 +43,8 @@ function c = demean(x)
 %
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
+
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
    
 if ndim(x)==1
     c = x-mean(x);
diff --git a/matlab/utilities/general/isfile.m b/matlab/utilities/general/isfile.m
index bcc3197ca..59f118710 100644
--- a/matlab/utilities/general/isfile.m
+++ b/matlab/utilities/general/isfile.m
@@ -28,7 +28,6 @@ function a = isfile(b)
 %@eod:
 
 % Copyright (C) 2012 Dynare Team
-% stephane DOT adjemian AT ens DOT fr
 %
 % This file is part of Dynare.
 %
@@ -45,6 +44,8 @@ function a = isfile(b)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 [base,ext] = strtok(b,'.');
 
 if isempty(ext)
diff --git a/matlab/utilities/general/ndim.m b/matlab/utilities/general/ndim.m
index 836d217bf..f9e2c80df 100644
--- a/matlab/utilities/general/ndim.m
+++ b/matlab/utilities/general/ndim.m
@@ -28,7 +28,6 @@ function n = ndim(x)
 %@eod:
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT ens DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -45,4 +44,6 @@ function n = ndim(x)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 n = sum(size(x)>1);
\ No newline at end of file
diff --git a/matlab/utilities/tests/dynTest.m b/matlab/utilities/tests/dynTest.m
index bf59e5b55..8dd2fc017 100644
--- a/matlab/utilities/tests/dynTest.m
+++ b/matlab/utilities/tests/dynTest.m
@@ -33,7 +33,6 @@ function dynTest(fun,dynare_path)
 %@eod:
 
 % Copyright (C) 2011-2012 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -50,6 +49,8 @@ function dynTest(fun,dynare_path)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 original_directory = pwd();
 
 [pathstr1, name1, ext1] = fileparts(fun);
diff --git a/matlab/utilities/tests/dyn_assert.m b/matlab/utilities/tests/dyn_assert.m
index 7dd60e5f5..c6b017081 100644
--- a/matlab/utilities/tests/dyn_assert.m
+++ b/matlab/utilities/tests/dyn_assert.m
@@ -2,7 +2,6 @@ function t = dyn_assert(A,B,tol)
 % This function tests the equality of two objects.
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -19,6 +18,8 @@ function t = dyn_assert(A,B,tol)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 if ( (nargin<3) || isempty(tol) )
     use_isequal_matlab_builtin = 1;
 else
diff --git a/matlab/utilities/tests/mtest.m b/matlab/utilities/tests/mtest.m
index 1ff44e2eb..1354deaed 100644
--- a/matlab/utilities/tests/mtest.m
+++ b/matlab/utilities/tests/mtest.m
@@ -2,7 +2,6 @@ function check = mtest(fname,fpath)
 % Extract test sections from matlab's routine executes the test and report errors.
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT univ DASH lemans DOT fr
 %
 % This file is part of Dynare.
 %
@@ -19,6 +18,8 @@ function check = mtest(fname,fpath)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 % Default answer (no problem).
 check = 1;
 
diff --git a/tests/internals/tests.m b/tests/internals/tests.m
index f755cbedf..54b139871 100644
--- a/tests/internals/tests.m
+++ b/tests/internals/tests.m
@@ -1,7 +1,6 @@
 % matlab script for testing matlab routines.
 
 % Copyright (C) 2011 Dynare Team
-% stephane DOT adjemian AT ens DOT fr
 %    
 % This file is part of Dynare.
 %
@@ -18,6 +17,8 @@
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
+% Original author: stephane DOT adjemian AT univ DASH lemans DOT fr
+
 list_of_routines = cell(1);
 
 list_of_routines(1,1) = {'../../matlab/@dynSeries'};         % path