Update copyright headers

37 files changed, 254 insertions, 254 deletions

diff --git a/matlab/tools/astra_add_noise_to_sino.m b/matlab/tools/astra_add_noise_to_sino.m
index a262f49..6ced65b 100644
--- a/matlab/tools/astra_add_noise_to_sino.m
+++ b/matlab/tools/astra_add_noise_to_sino.m
@@ -12,15 +12,15 @@ function sinogram_out = astra_add_noise_to_sino(sinogram_in,I0)
 % noise
 % sinogram_out: output sinogram in MATLAB-data.
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 if numel(sinogram_in) == 1
diff --git a/matlab/tools/astra_clear.m b/matlab/tools/astra_clear.m
index bc5f190..e558161 100644
--- a/matlab/tools/astra_clear.m
+++ b/matlab/tools/astra_clear.m
@@ -2,15 +2,15 @@
 % Clears and frees memory of all objects (data, projectors, algorithms) 
 % currently in the astra-library.
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 astra_mex_data2d('clear');
diff --git a/matlab/tools/astra_create_backprojection.m b/matlab/tools/astra_create_backprojection.m
index 7f0b02f..a6d6e1c 100644
--- a/matlab/tools/astra_create_backprojection.m
+++ b/matlab/tools/astra_create_backprojection.m
@@ -10,15 +10,15 @@ function [vol_id, vol] = astra_create_backprojection(data, proj_id)
 % vol_id: identifier of the volume data object as it is now stored in the astra-library.
 % vol: MATLAB data version of the volume
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_backprojection3d_cuda.m b/matlab/tools/astra_create_backprojection3d_cuda.m
index afa41db..3b1663d 100644
--- a/matlab/tools/astra_create_backprojection3d_cuda.m
+++ b/matlab/tools/astra_create_backprojection3d_cuda.m
@@ -12,15 +12,15 @@ function [vol_id, vol] = astra_create_backprojection3d_cuda(data, proj_geom, vol
 % the astra-library. 
 % vol: MATLAB data version of the volume.
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_backprojection_cuda.m b/matlab/tools/astra_create_backprojection_cuda.m
index cef7864..4c39f13 100644
--- a/matlab/tools/astra_create_backprojection_cuda.m
+++ b/matlab/tools/astra_create_backprojection_cuda.m
@@ -11,15 +11,15 @@ function backProj = astra_create_backprojection_cuda(sinogramData, proj_geom, vo
     % the reconstruction image
     % backProj: 2D back projection from sinogram data
     %--------------------------------------------------------------------------
-    %------------------------------------------------------------------------
-    % This file is part of the
-    % All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-    %
-    % Copyright: iMinds-Vision Lab, University of Antwerp
+    %--------------------------------------------------------------------------
+    % This file is part of the ASTRA Toolbox
+    % 
+    % Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+    %                 2014, CWI, Amsterdam
     % License: Open Source under GPLv3
-    % Contact: mailto:astra@ua.ac.be
-    % Website: http://astra.ua.ac.be
-    %------------------------------------------------------------------------
+    % Contact: astra@uantwerpen.be
+    % Website: http://sf.net/projects/astra-toolbox
+    %--------------------------------------------------------------------------
     % $Id$
 
     recon_id = astra_mex_data2d('create', '-vol', vol_geom, 0);
diff --git a/matlab/tools/astra_create_proj_geom.m b/matlab/tools/astra_create_proj_geom.m
index dbf0464..a389573 100644
--- a/matlab/tools/astra_create_proj_geom.m
+++ b/matlab/tools/astra_create_proj_geom.m
@@ -84,15 +84,15 @@ function proj_geom = astra_create_proj_geom(type, varargin)
 %          v  : the vector from detector pixel (0,0) to (1,0)
 % proj_geom: MATLAB struct containing all information of the geometry
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_projector.m b/matlab/tools/astra_create_projector.m
index f773d0d..e930450 100644
--- a/matlab/tools/astra_create_projector.m
+++ b/matlab/tools/astra_create_projector.m
@@ -11,15 +11,15 @@ function proj_id = astra_create_projector(type, proj_geom, vol_geom)
 % vol_geom: MATLAB struct containing the volume geometry.
 % proj_id: identifier of the projector as it is now stored in the astra-library.
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+% -------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_reconstruction.m b/matlab/tools/astra_create_reconstruction.m
index 15e452c..1e25fc9 100644
--- a/matlab/tools/astra_create_reconstruction.m
+++ b/matlab/tools/astra_create_reconstruction.m
@@ -18,15 +18,15 @@ function [recon_id, recon] = astra_create_reconstruction(rec_type, proj_id, sino
 % recon_id: identifier of the reconstruction data object as it is now stored in the astra-library
 % recon: MATLAB data version of the reconstruction
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_reconstruction_cuda.m b/matlab/tools/astra_create_reconstruction_cuda.m
index 726aa98..ffd3ede 100644
--- a/matlab/tools/astra_create_reconstruction_cuda.m
+++ b/matlab/tools/astra_create_reconstruction_cuda.m
@@ -19,15 +19,15 @@ function [recon_id, recon] = astra_create_reconstruction_cuda(rec_type, proj_geo
 % recon_id: identifier of the reconstruction data object as it is now stored in the astra-library
 % recon: MATLAB data version of the reconstruction
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_sino.m b/matlab/tools/astra_create_sino.m
index 4771bd6..a51f0e4 100644
--- a/matlab/tools/astra_create_sino.m
+++ b/matlab/tools/astra_create_sino.m
@@ -10,15 +10,15 @@ function [sino_id, sino] = astra_create_sino(data, proj_id)
 % sino_id: identifier of the sinogram data object as it is now stored in the astra-library.
 % sino: MATLAB data version of the sinogram
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_sino3d_cuda.m b/matlab/tools/astra_create_sino3d_cuda.m
index a725d82..54ca58d 100644
--- a/matlab/tools/astra_create_sino3d_cuda.m
+++ b/matlab/tools/astra_create_sino3d_cuda.m
@@ -12,15 +12,15 @@ function [sino_id, sino] = astra_create_sino3d_cuda(data, proj_geom, vol_geom)
 % the astra-library. 
 % sino: MATLAB data version of the sinogram.
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_sino_cuda.m b/matlab/tools/astra_create_sino_cuda.m
index 82bda7c..a2e7f53 100644
--- a/matlab/tools/astra_create_sino_cuda.m
+++ b/matlab/tools/astra_create_sino_cuda.m
@@ -13,15 +13,15 @@ function [sino_id, sino] = astra_create_sino_cuda(data, proj_geom, vol_geom, gpu
 % the astra-library. 
 % sino: MATLAB data version of the sinogram.
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_sino_gpu.m b/matlab/tools/astra_create_sino_gpu.m
index 95a3b09..75a47f7 100644
--- a/matlab/tools/astra_create_sino_gpu.m
+++ b/matlab/tools/astra_create_sino_gpu.m
@@ -13,15 +13,15 @@ function [sino_id, sino] = astra_create_sino_gpu(data, proj_geom, vol_geom, gpu_
 % the astra-library. 
 % sino: MATLAB data version of the sinogram.
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_sino_sampling.m b/matlab/tools/astra_create_sino_sampling.m
index 6b86d61..0b33994 100644
--- a/matlab/tools/astra_create_sino_sampling.m
+++ b/matlab/tools/astra_create_sino_sampling.m
@@ -13,15 +13,15 @@ function [sino_id, sino] = astra_create_sino_sampling(data, proj_geom, vol_geom,
 % the astra-library. 
 % sino: MATLAB data version of the sinogram.
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 
diff --git a/matlab/tools/astra_create_vol_geom.m b/matlab/tools/astra_create_vol_geom.m
index 61db8fb..0de5168 100644
--- a/matlab/tools/astra_create_vol_geom.m
+++ b/matlab/tools/astra_create_vol_geom.m
@@ -22,15 +22,15 @@ function vol_geom = astra_create_vol_geom(varargin)
 % slice_count: number of slices.
 % vol_geom: MATLAB struct containing all information of the geometry.
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 % astra_create_vol_geom([row_and_col_count ])
diff --git a/matlab/tools/astra_downsample_sinogram.m b/matlab/tools/astra_downsample_sinogram.m
index 30c1cdd..805fcc2 100644
--- a/matlab/tools/astra_downsample_sinogram.m
+++ b/matlab/tools/astra_downsample_sinogram.m
@@ -13,13 +13,13 @@ function [sinogram_new, proj_geom_new] = astra_downsample_sinogram(sinogram, pro
 % proj_geom_new: MATLAB struct containing the new projection geometry.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/astra_mex.m b/matlab/tools/astra_mex.m
index e04cfea..c1f8bf8 100644
--- a/matlab/tools/astra_mex.m
+++ b/matlab/tools/astra_mex.m
@@ -4,13 +4,13 @@ function [varargout] = astra_mex(varargin)
 %    <a href="matlab:docsearch('astra_mex' )">astra_mex</a>.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 if nargout == 0
diff --git a/matlab/tools/astra_mex_algorithm.m b/matlab/tools/astra_mex_algorithm.m
index 138a43c..901e90c 100644
--- a/matlab/tools/astra_mex_algorithm.m
+++ b/matlab/tools/astra_mex_algorithm.m
@@ -4,13 +4,13 @@ function [varargout] = astra_mex_algorithm(varargin)
 %    <a href="matlab:docsearch('astra_mex_algorithm' )">astra_mex_algorithm</a>.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 if nargout == 0
diff --git a/matlab/tools/astra_mex_data2d.m b/matlab/tools/astra_mex_data2d.m
index eacbcb9..542d7c6 100644
--- a/matlab/tools/astra_mex_data2d.m
+++ b/matlab/tools/astra_mex_data2d.m
@@ -4,13 +4,13 @@ function [varargout] = astra_mex_data2d(varargin)
 %    <a href="matlab:docsearch('astra_mex_data2d' )">astra_mex_data2d</a>.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 if nargout == 0
diff --git a/matlab/tools/astra_mex_data3d.m b/matlab/tools/astra_mex_data3d.m
index 3bbbd68..66e507a 100644
--- a/matlab/tools/astra_mex_data3d.m
+++ b/matlab/tools/astra_mex_data3d.m
@@ -4,13 +4,13 @@ function [varargout] = astra_mex_data3d(varargin)
 %    <a href="matlab:docsearch('astra_mex_data3d' )">astra_mex_data3d</a>.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 if nargout == 0
diff --git a/matlab/tools/astra_mex_matrix.m b/matlab/tools/astra_mex_matrix.m
index 182ab1e..35e266e 100644
--- a/matlab/tools/astra_mex_matrix.m
+++ b/matlab/tools/astra_mex_matrix.m
@@ -4,13 +4,13 @@ function [varargout] = astra_mex_matrix(varargin)
 %    <a href="matlab:docsearch('astra_mex_matrix' )">astra_mex_matrix</a>.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 if nargout == 0
diff --git a/matlab/tools/astra_mex_projector.m b/matlab/tools/astra_mex_projector.m
index 487da06..08f9e54 100644
--- a/matlab/tools/astra_mex_projector.m
+++ b/matlab/tools/astra_mex_projector.m
@@ -4,13 +4,13 @@ function [varargout] = astra_mex_projector(varargin)
 %    <a href="matlab:docsearch('astra_mex_projector' )">astra_mex_projector</a>.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 if nargout == 0
diff --git a/matlab/tools/astra_mex_projector3d.m b/matlab/tools/astra_mex_projector3d.m
index 3d21ce9..f72abe2 100644
--- a/matlab/tools/astra_mex_projector3d.m
+++ b/matlab/tools/astra_mex_projector3d.m
@@ -4,13 +4,13 @@ function [varargout] = astra_mex_projector3d(varargin)
 %    <a href="matlab:docsearch('astra_mex_projector3d' )">astra_mex_projector3d</a>.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 if nargout == 0
diff --git a/matlab/tools/astra_projector_handle.m b/matlab/tools/astra_projector_handle.m
index 72d4c73..2d1eba2 100644
--- a/matlab/tools/astra_projector_handle.m
+++ b/matlab/tools/astra_projector_handle.m
@@ -3,13 +3,13 @@ classdef astra_projector_handle < handle
     %   Automatically deletes the projector when deleted.
 
     %------------------------------------------------------------------------
-    % This file is part of the
-    % All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-    %
-    % Copyright: iMinds-Vision Lab, University of Antwerp
+    % This file is part of the ASTRA Toolbox
+    % 
+    % Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+    %                 2014, CWI, Amsterdam
     % License: Open Source under GPLv3
-    % Contact: mailto:astra@ua.ac.be
-    % Website: http://astra.ua.ac.be
+    % Contact: astra@uantwerpen.be
+    % Website: http://sf.net/projects/astra-toolbox
     %------------------------------------------------------------------------
 
     properties
diff --git a/matlab/tools/astra_set_directory.m b/matlab/tools/astra_set_directory.m
index 1d5a368..6018bad 100644
--- a/matlab/tools/astra_set_directory.m
+++ b/matlab/tools/astra_set_directory.m
@@ -9,13 +9,13 @@ function in = astra_set_directory(in)
 % in: input path.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/astra_set_gpu_index.m b/matlab/tools/astra_set_gpu_index.m
index 192ba00..fb2b64b 100644
--- a/matlab/tools/astra_set_gpu_index.m
+++ b/matlab/tools/astra_set_gpu_index.m
@@ -3,15 +3,15 @@ function astra_set_gpu_index(index)
 %--------------------------------------------------------------------------
 % Set the index of the GPU to use
 %--------------------------------------------------------------------------
-%------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+%--------------------------------------------------------------------------
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
-%------------------------------------------------------------------------
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
+%--------------------------------------------------------------------------
 % $Id$
 
 astra_mex('set_gpu_index', index);
diff --git a/matlab/tools/astra_struct.m b/matlab/tools/astra_struct.m
index f65b2ec..f7da5fe 100644
--- a/matlab/tools/astra_struct.m
+++ b/matlab/tools/astra_struct.m
@@ -9,13 +9,13 @@ function res = astra_struct(type)
 % res: the generated matlab struct.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 res = struct();
diff --git a/matlab/tools/createOrderART.m b/matlab/tools/createOrderART.m
index a469d8a..95d8fae 100644
--- a/matlab/tools/createOrderART.m
+++ b/matlab/tools/createOrderART.m
@@ -14,13 +14,13 @@ function rayOrder = createOrderART(proj_geom, mode)
 % the index of the ray.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/imreadgs.m b/matlab/tools/imreadgs.m
index 9c27eb4..c9d60f9 100644
--- a/matlab/tools/imreadgs.m
+++ b/matlab/tools/imreadgs.m
@@ -10,13 +10,13 @@ function Im = imreadgs(filename)
 % Im: a grayscale image in double.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/imresize3D.m b/matlab/tools/imresize3D.m
index 9032cc3..42d50b0 100644
--- a/matlab/tools/imresize3D.m
+++ b/matlab/tools/imresize3D.m
@@ -10,13 +10,13 @@ function out = imresize3D(in, s_out, method)
 % out: the resized 3-component image.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/imscale.m b/matlab/tools/imscale.m
index 957f11f..ddaa457 100644
--- a/matlab/tools/imscale.m
+++ b/matlab/tools/imscale.m
@@ -9,13 +9,13 @@ function out = imscale(in)
 % out: scaled output image.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/imwritesc.m b/matlab/tools/imwritesc.m
index 2f81dc8..fa059d6 100644
--- a/matlab/tools/imwritesc.m
+++ b/matlab/tools/imwritesc.m
@@ -9,13 +9,13 @@ function imwritesc(in, filename)
 % filename: name of output image file.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/kaiserBessel.m b/matlab/tools/kaiserBessel.m
index aef7b9d..808a5ac 100644
--- a/matlab/tools/kaiserBessel.m
+++ b/matlab/tools/kaiserBessel.m
@@ -12,13 +12,13 @@ function res = kaiserBessel(m,alpha,a,r)
 % res: the window values.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/linspace2.m b/matlab/tools/linspace2.m
index 2787fd9..422f03a 100644
--- a/matlab/tools/linspace2.m
+++ b/matlab/tools/linspace2.m
@@ -11,13 +11,13 @@ function out = linspace2(a,b,c)
 % out: linearly spaced vector.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/overlayImage.m b/matlab/tools/overlayImage.m
index 7c81e55..b4f24ce 100644
--- a/matlab/tools/overlayImage.m
+++ b/matlab/tools/overlayImage.m
@@ -9,13 +9,13 @@ function im = overlayImage(reconstruction, ground_truth)
 % im: output 3-component image, third channel is 0.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/rebin_fan2par.m b/matlab/tools/rebin_fan2par.m
index da20932..e0c713d 100644
--- a/matlab/tools/rebin_fan2par.m
+++ b/matlab/tools/rebin_fan2par.m
@@ -17,13 +17,13 @@ function F = rebin_fan2par(RadonData, BetaDeg, D, thetaDeg)
 % D,gamma,beta, theta zoals gebruikt in Kak & Slaney
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$
 
diff --git a/matlab/tools/sliceExtractor.m b/matlab/tools/sliceExtractor.m
index dfc87ee..c612152 100644
--- a/matlab/tools/sliceExtractor.m
+++ b/matlab/tools/sliceExtractor.m
@@ -11,13 +11,13 @@ function slice = sliceExtractor(data, dir, slicenr)
 % slice: 2D image matrix containing the slice.
 %------------------------------------------------------------------------
 %------------------------------------------------------------------------
-% This file is part of the
-% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox")
-%
-% Copyright: iMinds-Vision Lab, University of Antwerp
+% This file is part of the ASTRA Toolbox
+% 
+% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp
+%                 2014, CWI, Amsterdam
 % License: Open Source under GPLv3
-% Contact: mailto:astra@ua.ac.be
-% Website: http://astra.ua.ac.be
+% Contact: astra@uantwerpen.be
+% Website: http://sf.net/projects/astra-toolbox
 %------------------------------------------------------------------------
 % $Id$