diff --git a/MotionPlanning/CSpace/CSpace.h b/MotionPlanning/CSpace/CSpace.h
index 1844807c6f1b6cc0feb048235db7e8f8526f402a..aa7b0b69748be8d738964da0a450fba118335393 100644
--- a/MotionPlanning/CSpace/CSpace.h
+++ b/MotionPlanning/CSpace/CSpace.h
@@ -140,7 +140,7 @@ public:
 		\param storeValues Store the values here.
 		\param checkValid When set to true, it is guaranteed that the sample not in collision and all constraints are considered
 	*/
-	void getRandomConfig(Eigen::VectorXf &storeValues, bool checkvalid = false);
+	void getRandomConfig(Eigen::VectorXf &storeValues, bool checkValid = false);
 
 	//! set values of configuration considering boundaries
 	virtual void respectBoundaries(Eigen::VectorXf &config);
diff --git a/MotionPlanning/Planner/GraspRrt.h b/MotionPlanning/Planner/GraspRrt.h
index a63af0bb8e39e6673fdf91bf32d3a8d12b5b5c5c..d931357419cb8659d9adfae3012de46870f6b7cc 100644
--- a/MotionPlanning/Planner/GraspRrt.h
+++ b/MotionPlanning/Planner/GraspRrt.h
@@ -162,6 +162,10 @@ public:
 
 	/*!
 		Computes a step towards goalPose.
+		\param currentPose The current pose
+		\param goalPose The pose in global coord system.
+		\param storeCSpaceConf The result is stored here.
+		\return The resulting state.
 	*/
 	MoveArmResult createWorkSpaceSamplingStep(const Eigen::Matrix4f &currentPose, const Eigen::Matrix4f &goalPose, Eigen::VectorXf &storeCSpaceConf);
 
@@ -214,8 +218,8 @@ protected:
 
 	/*!
 		Current pose of RNS is moved.
-		\param deltaPose Consists of the 3x3 rotation delta R and the 3 dim translational delta T in homogeneous notation.
-		R and T must be given in global coordinate system.
+		\param deltaPose Consists of the 3x3 rotation delta R and the 3 dim translational delta T in homogeneous notation. R and T must be given in global coordinate system.
+		\param storeCSpaceConf The result is stored here.
 	*/
 	MoveArmResult moveArmDiffKin(const Eigen::Matrix4f &deltaPose, Eigen::VectorXf &storeCSpaceConf);
 
diff --git a/VirtualRobot/EndEffector/EndEffector.cpp b/VirtualRobot/EndEffector/EndEffector.cpp
index 116557e987639fabdf51be3a2712a15b1647e97a..2fe0c1cca5606860f8212d2150d21f03bf860828 100644
--- a/VirtualRobot/EndEffector/EndEffector.cpp
+++ b/VirtualRobot/EndEffector/EndEffector.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>, Nikolaus Vahrenkamp
+* @author     Manfred Kroehnert , Nikolaus Vahrenkamp
 * @copyright  2011 Manfred Kroehnert, Nikolaus Vahrenkamp
 */
 
diff --git a/VirtualRobot/EndEffector/EndEffectorActor.cpp b/VirtualRobot/EndEffector/EndEffectorActor.cpp
index 4e060e40689f7877a4c0d2d98ade07176e4404e7..9bfd31bf13deec96d97c927ca8c5e8411a866b0e 100644
--- a/VirtualRobot/EndEffector/EndEffectorActor.cpp
+++ b/VirtualRobot/EndEffector/EndEffectorActor.cpp
@@ -1,7 +1,7 @@
 /**
 * @package    VirtualRobot
 * @author     Nikolaus Vahrenkamp
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2011 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Grasping/Grasp.h b/VirtualRobot/Grasping/Grasp.h
index 6bca480a1e1713534bffda8abe9779faeb24df61..ebc77db1eb68da511a80229a1c8d3c91d833cb87 100644
--- a/VirtualRobot/Grasping/Grasp.h
+++ b/VirtualRobot/Grasping/Grasp.h
@@ -49,8 +49,9 @@ public:
 		\param poseInTCPCoordSystem The pose of the object, given in eef's tcp coordinate system
 		\param creation A custom string explaining how the grasp was created.
 		\param quality A custom quality index.
+		\param eefPreshape An optional preshape.
 	*/
-	Grasp(const std::string &name, const std::string &robotType, const std::string &eef, const Eigen::Matrix4f &poseInTCPCoordSystem, const std::string &creation= std::string(""), float quality = 0.0f, const std::string &eefPreshape= std::string(""));
+	Grasp(const std::string &name, const std::string &robotType, const std::string &eef, const Eigen::Matrix4f &poseInTCPCoordSystem, const std::string &creation= std::string(""), float quality = 0.0f, const std::string &eefPreshape = std::string(""));
 
 	/*!
 	*/
diff --git a/VirtualRobot/LinkedCoordinate.h b/VirtualRobot/LinkedCoordinate.h
index 624db192962afdf69f29db607cf4ecb5cc3db202..cfeef3448ccc6badd86527256668a3319c1dec0b 100644
--- a/VirtualRobot/LinkedCoordinate.h
+++ b/VirtualRobot/LinkedCoordinate.h
@@ -15,7 +15,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * @package    VirtualRobot
-* @author     Stefan Ulbrich <stefanulbrich at users dot sf dot net>
+* @author     Stefan Ulbrich
 * @copyright  2011 Stefan Ulbrich 
 * @license    http://www.gnu.org/licenses/gpl.txt
 *             GNU General Public License
@@ -90,7 +90,7 @@ public:
 
 	/** Sets the frame of reference and the coordinate relative to it.
 	 * @param frame The name of the robot node that defines the reference frame of the coordinate.
-	 * @param pose A homogeneous matrix that defines the pose relative to the frame of reference.  
+	 * @param position The pose relative to the frame of reference.  
 	 * @throw VirtualRobotException An exception is thrown if frame does not belong to the robot. 
 	 * @details A homogeneous vector can be previously converted using Eigen::Vector4f::head<3>().
 	 */
diff --git a/VirtualRobot/Nodes/RobotNodeFixedFactory.cpp b/VirtualRobot/Nodes/RobotNodeFixedFactory.cpp
index 95be279450c9c1ee3700afb154b5c489fc574336..aecd47cbd924f0eccc8f54a7e4c93a25278099d0 100644
--- a/VirtualRobot/Nodes/RobotNodeFixedFactory.cpp
+++ b/VirtualRobot/Nodes/RobotNodeFixedFactory.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Nodes/RobotNodePrismaticFactory.cpp b/VirtualRobot/Nodes/RobotNodePrismaticFactory.cpp
index 2869b7cabcf5522e5de6acc6be3767274580eefd..b8b324252a01bac9b6493221db1689e5913836c0 100644
--- a/VirtualRobot/Nodes/RobotNodePrismaticFactory.cpp
+++ b/VirtualRobot/Nodes/RobotNodePrismaticFactory.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Nodes/RobotNodeRevoluteFactory.cpp b/VirtualRobot/Nodes/RobotNodeRevoluteFactory.cpp
index 18c499245937d47e3fea4a75983894ac127ae037..42a3b0bc1d62246600ed71b866d1c62a1dfa6e1b 100644
--- a/VirtualRobot/Nodes/RobotNodeRevoluteFactory.cpp
+++ b/VirtualRobot/Nodes/RobotNodeRevoluteFactory.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/RobotConfig.h b/VirtualRobot/RobotConfig.h
index 5f78ab4b37c7f14fa4c51e8db8eddce5af705eb7..2aa98b85d01fb7f0c88b6af44d9e4111932275c1 100644
--- a/VirtualRobot/RobotConfig.h
+++ b/VirtualRobot/RobotConfig.h
@@ -81,7 +81,7 @@ public:
 
 	/*!
 		Appends a configuration to this instance.
-		\param True on success. False if robot is not present any more (may happen due to the use of weak pointers).
+		\return True on success. False if robot is not present any more (may happen due to the use of weak pointers).
 	*/
 	bool setConfig (const Configuration &c);
 	bool setConfig (RobotNodePtr node, float value);
@@ -90,7 +90,7 @@ public:
 	/*!
 		Apply the stored configurations to the corresponding robot.
 		RobotNodes that are not stored in this RobotConfig are not affected.
-		\param True on success. False if robot is not present any more (may happen due to the use of weak pointers).
+		\return True on success. False if robot is not present any more (may happen due to the use of weak pointers).
 	*/
 	bool setJointValues();
 
diff --git a/VirtualRobot/Transformation/Transformation.cpp b/VirtualRobot/Transformation/Transformation.cpp
index d99c41bda4e11e7e4a7e812e4c4692d653f8d12a..3e275fa3477d420d37fa9a271ea00497ff759c7c 100644
--- a/VirtualRobot/Transformation/Transformation.cpp
+++ b/VirtualRobot/Transformation/Transformation.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Transformation/tests/DHParameterTest.cpp b/VirtualRobot/Transformation/tests/DHParameterTest.cpp
index 9d8984660c3d190fd07d48e3c8ceaf8ddaac8180..b74a13b87036f13de01d15400d12565e4fc2f6ae 100644
--- a/VirtualRobot/Transformation/tests/DHParameterTest.cpp
+++ b/VirtualRobot/Transformation/tests/DHParameterTest.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Transformation/tests/TransformationTest.cpp b/VirtualRobot/Transformation/tests/TransformationTest.cpp
index 6f29a6131be1e3ca337e3c2592f28f895f44324c..5223e92712e4e4bcaaa5d21b73880d846f86a17b 100644
--- a/VirtualRobot/Transformation/tests/TransformationTest.cpp
+++ b/VirtualRobot/Transformation/tests/TransformationTest.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Visualization/CoinVisualization/CoinVisualization.cpp b/VirtualRobot/Visualization/CoinVisualization/CoinVisualization.cpp
index dffc7d6177b332dc567e9061b0d639ffaf51522d..c0fe7515a71eb6c6578f6d96aa194696cba01132 100644
--- a/VirtualRobot/Visualization/CoinVisualization/CoinVisualization.cpp
+++ b/VirtualRobot/Visualization/CoinVisualization/CoinVisualization.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp b/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp
index d39caf6ae63ab0f7ade4658a31f725786217084a..6d06955c87124c64e2731e642a3fb8a74964f224 100644
--- a/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp
+++ b/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp
@@ -1,7 +1,7 @@
 /**
 * @package    VirtualRobot
 * @author     Nikolaus Vahrenkamp
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert
 * @copyright  2010,2011 Nikolaus Vahrenkamp, Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationNode.cpp b/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationNode.cpp
index 69af4c86d4e483e625f7beaeed54da072879bc1f..7fd426c339e9036671ecc103442a9ebc45b607bc 100644
--- a/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationNode.cpp
+++ b/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationNode.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Visualization/CoinVisualization/tests/CoinVisualizationFactoryTest.cpp b/VirtualRobot/Visualization/CoinVisualization/tests/CoinVisualizationFactoryTest.cpp
index 91ccf0ebca9c0db3dd66a28526dc51cd35a84b29..274735be258f9e6253b1d81a5e3aeed0b47f7276 100644
--- a/VirtualRobot/Visualization/CoinVisualization/tests/CoinVisualizationFactoryTest.cpp
+++ b/VirtualRobot/Visualization/CoinVisualization/tests/CoinVisualizationFactoryTest.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Visualization/TriMeshModel.cpp b/VirtualRobot/Visualization/TriMeshModel.cpp
index 1d77bb6364f72959871110264af248afeba85f6a..fce60b82b781ad593bd8f16c3197713b2cd68b5d 100644
--- a/VirtualRobot/Visualization/TriMeshModel.cpp
+++ b/VirtualRobot/Visualization/TriMeshModel.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Visualization/Visualization.cpp b/VirtualRobot/Visualization/Visualization.cpp
index e44b58a93ebb12b6fc22fdb0e46762f22c500769..8c9b865c332c2dc963181331d4d3f97f77ecced9 100644
--- a/VirtualRobot/Visualization/Visualization.cpp
+++ b/VirtualRobot/Visualization/Visualization.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Visualization/VisualizationNode.cpp b/VirtualRobot/Visualization/VisualizationNode.cpp
index 4068e4c875cef05f4652f03e070eeffda0a50ec3..0f3f4dbe148358a8b8ef36be7be6dcf522371e12 100644
--- a/VirtualRobot/Visualization/VisualizationNode.cpp
+++ b/VirtualRobot/Visualization/VisualizationNode.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @author     Nikolaus Vahrenkamp
 * @copyright  2010 Manfred Kroehnert
 */
diff --git a/VirtualRobot/Visualization/tests/TriMeshModelTest.cpp b/VirtualRobot/Visualization/tests/TriMeshModelTest.cpp
index 00169cf50d19f1fab327dc786b8115d8503c66d2..881df0bc06944ed46faceeba63de86a9840c2ea6 100644
--- a/VirtualRobot/Visualization/tests/TriMeshModelTest.cpp
+++ b/VirtualRobot/Visualization/tests/TriMeshModelTest.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/Workspace/VoxelTree6D.hpp b/VirtualRobot/Workspace/VoxelTree6D.hpp
index 89582db5dfa7f02ce7a51092502a662d42b7c406..e95cb38e841606472ce0e7db91996cfb665a4171 100644
--- a/VirtualRobot/Workspace/VoxelTree6D.hpp
+++ b/VirtualRobot/Workspace/VoxelTree6D.hpp
@@ -117,13 +117,6 @@ public:
 		return root->getEntry(pos);
 	}
 
-
-	/*!
-		Check if the corresponding leaf is present in data structure.
-		\Return False if p is outside the extends or if no data is stored for pos
-	*/
-	//bool isCovered(float pos[6]);
-
 protected:
 	float minExtend[6];
 	float maxExtend[6];
diff --git a/VirtualRobot/Workspace/WorkspaceRepresentation.h b/VirtualRobot/Workspace/WorkspaceRepresentation.h
index 184a96485246d0c7049e72cab01cd2095f46d155..6427a7f7260ae35fc16a4cb0bf73e4a26baa139b 100644
--- a/VirtualRobot/Workspace/WorkspaceRepresentation.h
+++ b/VirtualRobot/Workspace/WorkspaceRepresentation.h
@@ -137,6 +137,7 @@ public:
 
 	/*!
 		Generate a random configuration for the robot node set. This configuration is within the joint limits of the current robot node set.
+		\param nodeSet The nodes.
 		\param checkForSelfCollisions Build a collision-free configuration. If true, random configs are generated until one is collision-free.
 	*/
 	virtual bool setRobotNodesToRandomConfig(VirtualRobot::RobotNodeSetPtr nodeSet, bool checkForSelfCollisions = true);
diff --git a/VirtualRobot/XML/BaseIO.cpp b/VirtualRobot/XML/BaseIO.cpp
index fa1a2af9443debc27bbbcbab1b154547f8162e8a..cd9636faea78167e7db3a955e29cd08a868b4c2a 100644
--- a/VirtualRobot/XML/BaseIO.cpp
+++ b/VirtualRobot/XML/BaseIO.cpp
@@ -144,7 +144,7 @@ Eigen::Matrix3f BaseIO::process3x3Matrix(rapidxml::xml_node<char> *matrixXMLNode
 
 
 /**
- * This method processes <Transform> tags.
+ * This method processes \<Transform\> tags.
  * If \p transformXMLNode is NULL (e.g. the tag does not exist) \p transform
  * is set to contain the identity matrix.
  */
@@ -436,7 +436,7 @@ void BaseIO::getLowerCase(std::string& aString)
 
 
 /**
- * This method processes the \p parentNode Tag and extracts a list of <Node name="xyz"/> tags.
+ * This method processes the \p parentNode Tag and extracts a list of \<Node name="xyz"/\> tags.
  * All other child tags raise a VirtualRobot::VirtualRobotException.
  * The resulting nodes are stored in \p nodeList.
  *
diff --git a/VirtualRobot/XML/ObjectIO.h b/VirtualRobot/XML/ObjectIO.h
index 846b54789b79b15b35926f9198a1ef173272b1cd..e1d737983929b115cd620fa7d036b7deb0023ddb 100644
--- a/VirtualRobot/XML/ObjectIO.h
+++ b/VirtualRobot/XML/ObjectIO.h
@@ -59,6 +59,7 @@ public:
 	
 	/*!
         Creates ManipulationObject from string.
+		@param xmlString The input string.
         @param basePath If file tags are given, the base path for searching the object files can be specified.
     */
     static ManipulationObjectPtr createManipulationObjectFromString(const std::string &xmlString, const std::string &basePath = "");
diff --git a/VirtualRobot/XML/RobotIO.cpp b/VirtualRobot/XML/RobotIO.cpp
index 8a251536d38fc1e002d1ba1abd436ea8a20430ea..00a72918512014101a5560ab34c4c6629fcdd50f 100644
--- a/VirtualRobot/XML/RobotIO.cpp
+++ b/VirtualRobot/XML/RobotIO.cpp
@@ -73,7 +73,7 @@ void RobotIO::processChildFromRobotNode(rapidxml::xml_node<char> *childXMLNode,
 
 
 /**
- * This method processes <Limits> tags.
+ * This method processes Limits tags.
  * The values for the attributes "lo" and "hi" are extracted based on the
  * "unit" or "units" attribute.
  *
@@ -847,8 +847,8 @@ EndEffectorPtr RobotIO::processEndeffectorNode(rapidxml::xml_node<char>* endeffe
 
 
 /**
- * This method processes the attributes and the children of an <actor> tag which
- * itself is a child of the <endeffector> tag.
+ * This method processes the attributes and the children of an actor tag which
+ * itself is a child of the endeffector tag.
  * First the name attribute is retrieved and afterwards the child nodes are
  * processed which make up the actor.
  */
@@ -865,8 +865,8 @@ EndEffectorActorPtr RobotIO::processEndeffectorActorNode(rapidxml::xml_node<char
  
 
 /**
- * This method processes the children of the <static> tag which
- * itself is a child of the <endeffector> tag.
+ * This method processes the children of the static tag which
+ * itself is a child of the endeffector tag.
  */
 void RobotIO::processEndeffectorStaticNode(rapidxml::xml_node<char>* endeffectorStaticXMLNode, RobotPtr robo, std::vector<RobotNodePtr>& staticNodesList)
 {
@@ -875,7 +875,7 @@ void RobotIO::processEndeffectorStaticNode(rapidxml::xml_node<char>* endeffector
 
 
 /**
- * This method processes the \p parentNode Tag and extracts a list of <Node name="xyz" speed="0123" /> tags.
+ * This method processes the \p parentNode Tag and extracts a list of \<Node name="xyz" speed="0123" /\> tags.
  * All other child tags raise a VirtualRobot::VirtualRobotException.
  * The resulting nodes are stored in \p nodeList.
  *
diff --git a/VirtualRobot/XML/RobotIO.h b/VirtualRobot/XML/RobotIO.h
index 4966de2180a118379c7d65dc2c8d4a38cae55abe..d563ddb87eb31e1458c5a6aa2f9a8ed237291c31 100644
--- a/VirtualRobot/XML/RobotIO.h
+++ b/VirtualRobot/XML/RobotIO.h
@@ -68,7 +68,8 @@ public:
 	
 	/*!
             Creates Robot from string.
-            @param basePath If any <childFromRobot> tags are given, the path for searching the robot files can be specified.
+			@param xmlString The input string.
+            @param basePath If any \<childFromRobot\> tags are given, the path for searching the robot files can be specified.
             @param loadMode Standard: eFull, When eStructure is used no visualization oand collision models are loaded for faster access.
         */
         static RobotPtr createRobotFromString(const std::string &xmlString, const std::string &basePath = "", RobotDescription loadMode = eFull);
diff --git a/VirtualRobot/XML/SceneIO.h b/VirtualRobot/XML/SceneIO.h
index 5c66d17b9adcb23f398d069a2717a68b8e8d71b9..933ad8da9b1810144bed213a6de485866d7e158c 100644
--- a/VirtualRobot/XML/SceneIO.h
+++ b/VirtualRobot/XML/SceneIO.h
@@ -58,6 +58,7 @@ public:
 	
 	/*!
         Creates scene from string.
+		\param xmlString The input.
         \param basePath If any robot tags are given, the base path for searching the robot files can be specified.
     */
     static ScenePtr createSceneFromString(const std::string &xmlString, const std::string &basePath = "");
diff --git a/VirtualRobot/tests/VirtualRobotExceptionTest.cpp b/VirtualRobot/tests/VirtualRobotExceptionTest.cpp
index 29dc953d1d12a1080394cb8b73859bf972c0b5d5..7aa35187f518279d85b4ead4dd73b712da0dda22 100644
--- a/VirtualRobot/tests/VirtualRobotExceptionTest.cpp
+++ b/VirtualRobot/tests/VirtualRobotExceptionTest.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Manfred Kroehnert <mkroehnert _at_ users dot sourceforge dot net>
+* @author     Manfred Kroehnert 
 * @copyright  2010 Manfred Kroehnert
 */
 
diff --git a/VirtualRobot/tests/VirtualRobotLinkedCoordinateTest.cpp b/VirtualRobot/tests/VirtualRobotLinkedCoordinateTest.cpp
index 214befe9892824817de48120232d6a0e1f02666c..c3ce4c8ae55ed52558e5b22cccc88020820fc168 100644
--- a/VirtualRobot/tests/VirtualRobotLinkedCoordinateTest.cpp
+++ b/VirtualRobot/tests/VirtualRobotLinkedCoordinateTest.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Stefan Ulbrich <stefanulbrich at users dot sf dot net>, Nikolaus Vahrenkamp 
+* @author     Stefan Ulbrich, Nikolaus Vahrenkamp 
 * @copyright  2010,2011 Stefan Ulbrich, Nikolaus Vahrenkamp
 */
 
diff --git a/VirtualRobot/tests/VirtualRobotThreadsafetyTest.cpp b/VirtualRobot/tests/VirtualRobotThreadsafetyTest.cpp
index 7bd0135fccb1055ba4742e90c3be54254298dac9..544af0b8cebae5c9750a23249c7353aed93a8fa4 100644
--- a/VirtualRobot/tests/VirtualRobotThreadsafetyTest.cpp
+++ b/VirtualRobot/tests/VirtualRobotThreadsafetyTest.cpp
@@ -1,6 +1,6 @@
 /**
 * @package    VirtualRobot
-* @author     Stefan Ulbrich <stefanulbrich at users dot sf dot net>, Nikolaus Vahrenkamp 
+* @author     Stefan Ulbrich, Nikolaus Vahrenkamp 
 * @copyright  2010,2011,2012 Stefan Ulbrich, Nikolaus Vahrenkamp
 */
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a17a53684498bb07863f57f00157c5d477a2bcfd..8709d98e74ed16d216caaa33be5f441f7bd31094 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -46,6 +46,9 @@ IF(DOXYGEN_FOUND)
     # set image path
     SET (CMAKE_DOXYGEN_IMAGE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/images")
     
+    # set exclude files
+    SET (CMAKE_EXCLUDE_LIST "${CMAKE_CURRENT_SOURCE_DIR}/../VirtualRobot/XML/rapidxml.hpp")
+    
     # replace ; with space
     STRING(REGEX REPLACE ";" " " DOXYGEN_INPUT_DIRECTORIES "${CMAKE_DOXYGEN_INPUT_LIST}")
     
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 91117fc5e11041701b5bb8c7b97ac490c11fd906..767647c0be7658ca0280b598efe4ed3235027250 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -701,7 +701,7 @@ RECURSIVE              = NO
 # subdirectory from a directory tree whose root is specified with the INPUT tag. 
 # Note that relative paths are relative to directory from which doxygen is run.
 
-EXCLUDE                = rapidxml.hpp
+EXCLUDE                = @CMAKE_EXCLUDE_LIST@
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix file system feature) are excluded