From 62f66d27fc4d2b3c61e3f18ad14eeac742cb96ec Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Tue, 5 Jan 2016 16:32:26 +0100
Subject: Update credits

---
 matlab/mex/astra_mex_c.cpp | 21 ++++++++++++---------
 python/astra/astra_c.pyx   | 28 +++++++++++++---------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp
index a9b9654..d34334c 100644
--- a/matlab/mex/astra_mex_c.cpp
+++ b/matlab/mex/astra_mex_c.cpp
@@ -50,16 +50,19 @@ using namespace astra;
  */
 void astra_mex_credits(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[])
 { 
-	mexPrintf("All Scale Tomographic Reconstruction Antwerp Toolbox (ASTRA-Toolbox) was developed at the University of Antwerp by\n");
+	mexPrintf("The ASTRA Toolbox has been developed at the University of Antwerp and CWI, Amsterdam by\n");
 	mexPrintf(" * Prof. dr. Joost Batenburg\n");
-	mexPrintf(" * Andrei Dabravolski\n");
-	mexPrintf(" * Gert Merckx\n");
-	mexPrintf(" * Willem Jan Palenstijn\n");
-	mexPrintf(" * Tom Roelandts\n");
 	mexPrintf(" * Prof. dr. Jan Sijbers\n");
-	mexPrintf(" * dr. Wim van Aarle\n");
-	mexPrintf(" * Sander van der Maar\n");
-	mexPrintf(" * dr. Gert Van Gompel\n");
+	mexPrintf(" * Dr. Jeroen Bedorf\n");
+	mexPrintf(" * Dr. Folkert Bleichrodt\n");
+	mexPrintf(" * Dr. Andrei Dabravolski\n");
+	mexPrintf(" * Dr. Willem Jan Palenstijn\n");
+	mexPrintf(" * Dr. Tom Roelandts\n");
+	mexPrintf(" * Dr. Wim van Aarle\n");
+	mexPrintf(" * Dr. Gert Van Gompel\n");
+	mexPrintf(" * Sander van der Maar, MSc.\n");
+	mexPrintf(" * Gert Merckx, MSc.\n");
+	mexPrintf(" * Daan Pelt, MSc.\n");
 }
 
 //-----------------------------------------------------------------------------------------
@@ -100,7 +103,7 @@ void astra_mex_version(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[
 	if (1 <= nlhs) {
 		plhs[0] = mxCreateDoubleScalar(astra::getVersion());
 	} else {
-		mexPrintf("astra toolbox version %s\n", astra::getVersionString());
+		mexPrintf("ASTRA Toolbox version %s\n", astra::getVersionString());
 	}
 }
 
diff --git a/python/astra/astra_c.pyx b/python/astra/astra_c.pyx
index 342a214..6b246b6 100644
--- a/python/astra/astra_c.pyx
+++ b/python/astra/astra_c.pyx
@@ -45,21 +45,19 @@ ELSE:
     pass
 
 def credits():
-    six.print_("""
-All Scale Tomographic Reconstruction Antwerp Toolbox (ASTRA-Toolbox)
-was developed at the University of Antwerp by
-    * Prof. dr. Joost Batenburg
-    * Andrei Dabravolski
-    * Gert Merckx
-    * Willem Jan Palenstijn
-    * Tom Roelandts
-    * Prof. dr. Jan Sijbers
-    * dr. Wim van Aarle
-    * Sander van der Maar
-    * dr. Gert Van Gompel
-
-Python interface written by
-    * Daniel M. Pelt (CWI, Amsterdam)""")
+    six.print_("""The ASTRA Toolbox has been developed at the University of Antwerp and CWI, Amsterdam by
+ * Prof. dr. Joost Batenburg
+ * Prof. dr. Jan Sijbers
+ * Dr. Jeroen Bedorf
+ * Dr. Folkert Bleichrodt
+ * Dr. Andrei Dabravolski
+ * Dr. Willem Jan Palenstijn
+ * Dr. Tom Roelandts
+ * Dr. Wim van Aarle
+ * Dr. Gert Van Gompel
+ * Sander van der Maar, MSc.
+ * Gert Merckx, MSc.
+ * Daan Pelt, MSc.""")
 
 
 def use_cuda():
-- 
cgit v1.2.3