diff --git a/Core/Code/DataManagement/mitkVector.h b/Core/Code/DataManagement/mitkVector.h
index 6acd492e6a..fb723de619 100644
--- a/Core/Code/DataManagement/mitkVector.h
+++ b/Core/Code/DataManagement/mitkVector.h
@@ -1,178 +1,195 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef MITKVECTOR_H_
 #define MITKVECTOR_H_
 
 
 #include <itkVector.h>
 #include <vnl/vnl_vector_fixed.h>
 #include <vnl/vnl_vector.h>
 
 #include "mitkTypeBasics.h"
 #include "mitkLogMacros.h"
 
 namespace mitk
 {
 
   template<class TCoordRep, unsigned int NVectorDimension = 3>
   class Vector : public itk::Vector<TCoordRep, NVectorDimension>
   {
   public:
     /**
      * @brief Default constructor has nothing to do.
      */
     Vector<TCoordRep, NVectorDimension>()
       : itk::Vector<TCoordRep, NVectorDimension>() {}
 
     /**
      * @brief Copy constructor.
      * Can convert nonidentical coordinate representations.
      * E.g. use this to convert from mitk::Vector<float, 3> to mitk::Vector<double,3>
      */
     template <typename TOtherCoordRep>
     Vector<TCoordRep, NVectorDimension>(const Vector<TOtherCoordRep, NVectorDimension>& r)
       : itk::Vector<TCoordRep, NVectorDimension>(r) {}
 
     /**
      * @brief Constructor to convert from itk::Vector to mitk::Vector.
      * Can convert non-identical coordinate representations.
      * E.g. use this to convert from itk::Vector<double, 3> to mitk::Vector<float,3>
      */
     template <typename TOtherCoordRep>
     Vector<TCoordRep, NVectorDimension>(const itk::Vector<TOtherCoordRep, NVectorDimension>& r)
       : itk::Vector<TCoordRep, NVectorDimension>(r) {}
 
 //    /**
 //     * @brief convert an array of the same data type to Vector.
 //     * @param r the array. Attention: must have NVectorDimension valid arguments!
 //     */
 //    Vector<TCoordRep, NVectorDimension>(const TCoordRep r[NVectorDimension])
 //      : itk::Vector<TCoordRep, NVectorDimension>(r) {}
 
     /**
      * @brief convert an array of a different data type to Vector
-     * @param r the array. Attention: must have NVectorDimension valid arguments!
+     * @param r the array.
+     * @attention must have NVectorDimension valid arguments!
      */
     template <typename TOtherCoordRep>
     Vector<TCoordRep, NVectorDimension>(const TOtherCoordRep r[NVectorDimension])
       : itk::Vector<TCoordRep, NVectorDimension>()
     { // TODO SW: very strange: you could leave the following lines and gcc would still copy the array!
       for (int var = 0; var < 3; ++var) {
         this->SetElement(var, static_cast<TCoordRep>(r[var]));
       }
     }
 
     /**
      * Constructor to initialize entire vector to one value.
      */
     Vector<TCoordRep, NVectorDimension>(const TCoordRep & v)
         : itk::Vector<TCoordRep, NVectorDimension>(v) {}
 
     /**
      * @brief Constructor for vnl_vectors.
      * Can convert non-identical coordinate representations.
-     * Attention: vnlVector should have same size as NVectorDimension, otherwise
-     * 1. elements will be lost in case vnlVector is bigger.
-     * 2. elements will be set to 0 in case this is bigger.
-     * In both cases, MITK_WARN warnings will be issued.
+     * @attention vnlVector should have same size as NVectorDimension, otherwise
+     * @attention 1. elements will be lost in case vnlVector is bigger.
+     * @attention 2. elements will be set to 0 in case this is bigger.
+     * @attention In both cases, MITK_WARN warnings will be issued.
      */
     template <typename TOtherCoordRep>
     Vector<TCoordRep, NVectorDimension>(const vnl_vector<TOtherCoordRep>& vnlVector)
             : itk::Vector<TCoordRep, NVectorDimension>()
     {
       this->Fill(0);
 
       if (vnlVector.size() < NVectorDimension)
         MITK_WARN << "Attention: conversion of vnl_vector to mitk::Vector:"
                   << "the mitk::Vector has more elements than the vnl_vector. Remaining elements will be set to 0.";
 
       if (NVectorDimension < vnlVector.size())
         MITK_WARN << "Attention: conversion of vnl_vector to mitk::Vector:"
                   << "the vnl_vector has more elements than the mitk::Vector. vnlVector[NVectorDimension .. vnlVector.size()] will be lost.";
 
       for (int var = 0; (var < NVectorDimension) && (var < vnlVector.size()); ++var) {
         this->SetElement(var, static_cast<TCoordRep>(vnlVector.get(var)));
       }
     }
 
     template <unsigned int NOtherVectorDimension>
     Vector<TCoordRep, NVectorDimension>& operator=(const Vector<TCoordRep, NOtherVectorDimension>& otherVector)
     {
       for (int var = 0; (var < NVectorDimension) && (var < NOtherVectorDimension); ++var) {
         this->SetElement(var, static_cast<TCoordRep>(otherVector[var]));
       }
       return *this;
     }
 
 
     /**
      * @brief Convert a vnl_vector_fixed to a mitk::Vector of the same size.
      * Can convert non-identical coordinate representations.
      */
     template <typename TOtherCoordRep>
     Vector<TCoordRep, NVectorDimension>(const vnl_vector_fixed<TOtherCoordRep, NVectorDimension> vnlVectorFixed)
         : itk::Vector<TCoordRep, NVectorDimension>()
     {
       for (int var = 0; var < 3; ++var) {
         this->SetElement(var, static_cast<TOtherCoordRep>(vnlVectorFixed[var]));
       }
     };
 
-    template <unsigned int NOtherVectorDimension>
-    Vector<TCoordRep, NVectorDimension>& operator=(const vnl_vector_fixed<TCoordRep, NOtherVectorDimension>& vnlVectorFixed)
+    template <typename TOtherCoordRep>
+    Vector<TCoordRep, NVectorDimension>& operator=(const vnl_vector_fixed<TOtherCoordRep, NVectorDimension>& vnlVectorFixed)
     {
-      for (int var = 0; (var < NVectorDimension) && (var < NOtherVectorDimension); ++var) {
+      for (int var = 0; (var < NVectorDimension); ++var) {
         this->SetElement(var, static_cast<TCoordRep>(vnlVectorFixed[var]));
       }
       return *this;
     }
 
+//    /**
+//     * @brief User defined conversion of mitk::Vector to vnl_vector_fixed
+//     * mustn't implement when vnl_vector is implemented due to implicit conversion of mitk::Vector3D.
+//     */
+//    template <typename TOtherCoordRep>
+//    operator vnl_vector_fixed<TOtherCoordRep, NVectorDimension> () const
+//    {
+//      Vector<TOtherCoordRep, NVectorDimension> convertedVector = *this;
+//      vnl_vector_fixed<TOtherCoordRep, NVectorDimension> vnlVectorFixed(convertedVector.GetVnlVector());
+//      return vnlVectorFixed;
+//    }
 
     /**
-     * @brief User defined conversion of mitk::Vector to vnl_vector_fixed
+     * @brief User defined conversion of mitk::Vector to vnl_vector
      */
     template <typename TOtherCoordRep>
-    operator vnl_vector_fixed<TOtherCoordRep, NVectorDimension> () const
+    operator vnl_vector<TOtherCoordRep> () const
     {
       Vector<TOtherCoordRep, NVectorDimension> convertedVector = *this;
-      vnl_vector_fixed<TOtherCoordRep, NVectorDimension> vnlVectorFixed(convertedVector.GetVnlVector());
-      return vnlVectorFixed;
+      vnl_vector<TOtherCoordRep> vnlVector(convertedVector.GetVnlVector());
+      return vnlVector;
     }
 
 
     /**
-     * @brief Copies the array array_p to this Vector.
-     * Warning: Array must have same dimension as Vector
+     * @brief Copies the elements of this into the array r
+     * @param[out] r    the array which will hold the elements.
+     * @attention Must be of at least dimension NVectorDimension!
      */
     template <typename TOtherCoordRep>
-    void CopyToArray(TOtherCoordRep array_p[NVectorDimension]) const
+    void CopyToArray(TOtherCoordRep r[NVectorDimension]) const
     {
       for (int i = 0; i < this->GetVectorDimension(); i++)
         {
-          array_p[i] = static_cast<TOtherCoordRep>(this->GetElement(i));
+          r[i] = static_cast<TOtherCoordRep>(this->GetElement(i));
         }
     }
 
+  private:
+
+
+
   }; // end mitk::Vector
 
   typedef Vector<ScalarType,2> Vector2D;
   typedef Vector<ScalarType,3> Vector3D;
   typedef Vector<ScalarType,4> Vector4D;
 
 } // end namespace mitk
 
 #endif /* MITKVECTOR_H_ */
diff --git a/Core/Code/Testing/mitkTypeVectorConversionTest.cpp b/Core/Code/Testing/mitkTypeVectorConversionTest.cpp
index 7707faa11e..2c8e972894 100644
--- a/Core/Code/Testing/mitkTypeVectorConversionTest.cpp
+++ b/Core/Code/Testing/mitkTypeVectorConversionTest.cpp
@@ -1,336 +1,366 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include <iostream>
 
 #include "itkVector.h"
 
 #include <vnl/vnl_vector_ref.h>
 #include <vnl/vnl_vector_fixed_ref.h>
 #include "vnl/vnl_math.h"
 
 #include "mitkTestingMacros.h"
 #include "mitkTypeBasics.h"
 #include "mitkVector.h"
 #include "mitkTypes.h" // for Equals
 
 using namespace mitk;
 
 /**
  * these private variables are used in the test functions
  *
  * The variable which should be copied into is set to its original value.
  * The value which should be copied is set to valuesToCopy.
  *
  * Then the copying takes place. The test is successful, if the variable which
  * should be copied into holds the valuesToCopy afterwards and is equal to the
  * vector which should be copied.
  */
 static const ScalarType originalValues[]      =  {1.123456789987, 2.789456321456, 3.123654789987456};
 static const float      originalValuesFloat[] =  {1.123456789987, 2.789456321456, 3.123654789987456};
 
 static const ScalarType valuesToCopy[]        =  {4.654789123321, 5.987456789321, 6.321654987789546};
 static const float      valuesToCopyFloat[]   =  {4.654789123321, 5.987456789321, 6.321654987789546};
 
 
 static void Test_pod2mitk(void)
 {
   mitk::Vector3D vector3D = valuesToCopy;
 
   MITK_TEST_CONDITION(EqualArray(vector3D, valuesToCopy, 3), "pod copied into vector of same type")
 }
 
 static void Test_pod2mitk_DifferentType(void)
 {
   mitk::Vector3D vector3D = valuesToCopyFloat;
 
   MITK_TEST_CONDITION(EqualArray(vector3D, valuesToCopyFloat, 3, vnl_math::float_eps), "float pod copied into double vector")
 }
 
 
 static void Test_mitk2pod(void)
 {
   ScalarType podArray[3];
   mitk::Vector3D vector3D = valuesToCopy;
 
   vector3D.CopyToArray(podArray);
 
   MITK_TEST_CONDITION(EqualArray(podArray, vector3D, 3), "mitk vector copied into pod array")
 }
 
 static void Test_mitk2pod_DifferentType(void)
 {
   float podArray[3];
   mitk::Vector3D vector3D = valuesToCopy;
 
   vector3D.CopyToArray(podArray);
 
   MITK_TEST_CONDITION(EqualArray(podArray, vector3D, 3, vnl_math::float_eps*10.0), "mitk vector copied into pod array with different type")
 }
 
 static void Test_oneElement2mitk(void)
 {
   double twos[] = {2.0, 2.0, 2.0};
   mitk::Vector<double, 3> vector3D(2.0);
 
   MITK_TEST_CONDITION(EqualArray(vector3D, twos, 3), "one values initializes all elements to this value")
 }
 
 static void Test_oneElement2mitk_DifferentType(void)
 {
   float twos[] = {2.0, 2.0, 2.0};
   mitk::Vector<double, 3> vector3D(2.0F);
 
   MITK_TEST_CONDITION(EqualArray(vector3D, twos, 3), "one values initializes all elements to this value: value has different type than vector.")
 }
 
 static void Test_mitk2mitk_DifferentType(void)
 {
   mitk::Vector<float, 3>  floatVector3D  = originalValuesFloat;
   mitk::Vector<double, 3> doubleVector3D = valuesToCopy;
 
   floatVector3D = doubleVector3D;
 
   MITK_TEST_CONDITION(floatVector3D == doubleVector3D, "mitk double vector assigned to mitk float vector")
   MITK_TEST_CONDITION(EqualArray(floatVector3D, valuesToCopy, 3, vnl_math::float_eps * 10.0), "correct values were assigned within float accuracy")
 }
 
 static void Test_mitk2mitk_ShorterVectorAssigned(void)
 {
   mitk::Vector3D vector3D = originalValues;
   mitk::Vector2D vector2D = valuesToCopy;
 
   vector3D = vector2D;
 
   bool firstTwoElementsCopied = EqualArray(vector3D, vector2D, 2);
   bool lastElementIsUntouched = (vector3D[2] == originalValues[2]);
 
   MITK_TEST_CONDITION(firstTwoElementsCopied, "shorter mitk vector correctly assigned to mitk vector: first two elements were copied" )
   MITK_TEST_CONDITION(lastElementIsUntouched, "shorter mitk vector correctly assigned to mitk vector: last element was untoched")
 
 }
 
 static void Test_itk2mitk(void)
 {
   Vector3D vector3D = originalValues;
   itk::Vector<ScalarType, 3> itkVector = valuesToCopy;
 
   vector3D = itkVector;
 
   MITK_TEST_CONDITION(vector3D == itkVector, "itk vector assigned to mitk vector")
   MITK_TEST_CONDITION(vector3D == valuesToCopy, "correct values were assigned")
 }
 
 static void Test_itk2mitk_DifferentType(void)
 {
   Vector3D vector3D = originalValues;
   itk::Vector<float, 3> itkVector = valuesToCopyFloat;
 
   vector3D = itkVector;
 
   MITK_TEST_CONDITION(vector3D == itkVector, "itk float vector assigned to mitk double vector")
   MITK_TEST_CONDITION(EqualArray(vector3D, valuesToCopyFloat, 3), "correct values were assigned")
 }
 
 static void Test_mitk2itk(void)
 {
   Vector3D vector3D = valuesToCopy;
   itk::Vector<ScalarType, 3> itkVector = originalValues;
 
   itkVector = vector3D;
 
   MITK_TEST_CONDITION(vector3D == itkVector, "mitk vector assigned to itk vector")
   MITK_TEST_CONDITION(itkVector == valuesToCopy, "correct values were assigned")
 }
 
 static void Test_mitk2itk_DifferentType(void)
 {
   itk::Vector<double,3> itkDoubleVector = originalValues;
   mitk::Vector<float, 3> mitkFloatVector = valuesToCopyFloat;
 
   itkDoubleVector = mitkFloatVector;
 
   MITK_TEST_CONDITION(itkDoubleVector == mitkFloatVector, "mitk float vector assigned to itk double vector")
   MITK_TEST_CONDITION(EqualArray(itkDoubleVector, valuesToCopyFloat, 3), "correct values were assigned")
 }
 
 
 static void Test_vnlfixed2mitk(void)
 {
   mitk::Vector3D vector3D = originalValues;
   vnl_vector_fixed<ScalarType, 3> vnlVectorFixed(valuesToCopy);
 
   vector3D = vnlVectorFixed;
 
   MITK_TEST_CONDITION( vector3D.GetVnlVector() == vnlVectorFixed, "vnl_vector_fixed assigned to mitk vector")
   MITK_TEST_CONDITION( vector3D == valuesToCopy, "correct values were assigned" )
 }
 
 static void Test_vnlfixed2mitk_DifferentType(void)
 {
   mitk::Vector<double, 3> vector3D = originalValues;
   vnl_vector_fixed<float, 3> vnlVectorFixed(valuesToCopyFloat);
 
   vector3D = vnlVectorFixed;
 
   MITK_TEST_CONDITION( EqualArray(vector3D, vnlVectorFixed, 3), "vnl_vector_fixed float assigned to mitk vector double")
   MITK_TEST_CONDITION( EqualArray(vector3D, valuesToCopyFloat, 3),   "correct values were assigned" )
 }
 
 static void Test_mitk2vnlfixed(void)
 {
   vnl_vector_fixed<ScalarType, 3> vnlVectorFixed(originalValues);
   mitk::Vector3D vector3D = valuesToCopy;
 
   vnlVectorFixed = vector3D;
 
   MITK_TEST_CONDITION( vnlVectorFixed == vector3D.GetVnlVector(), "mitk vector assigned to vnl_vector_fixed")
   MITK_TEST_CONDITION( EqualArray(vnlVectorFixed, valuesToCopy, 3), "correct values were assigned" )
 }
 
 static void Test_mitk2vnlfixed_DifferentType(void)
 {
   vnl_vector_fixed<float, 3> vnlVectorFixed(originalValuesFloat);
   mitk::Vector<double, 3> vector3D = valuesToCopy;
 
   vnlVectorFixed = vector3D;
 
-  MITK_TEST_CONDITION( EqualArray(vnlVectorFixed, vector3D, 3, vnl_math::float_eps * 10.0), "mitk vector assigned to vnl_vector_fixed")
+  MITK_TEST_CONDITION( EqualArray(vnlVectorFixed, vector3D, 3, vnl_math::float_eps * 10.0), "mitk vector double assigned to vnl_vector_fixed float")
   MITK_TEST_CONDITION( EqualArray(vnlVectorFixed, valuesToCopy, 3, vnl_math::float_eps * 10.0), "correct values were assigned" )
 }
 
 
-static void Test_vnl2mitk()
+static void Test_vnl2mitk(void)
 {
 
   mitk::Vector3D vector3D = originalValues;
   vnl_vector<ScalarType> vnlVector(3);
   vnlVector.set(valuesToCopy);
 
   vector3D = vnlVector;
 
   MITK_TEST_CONDITION( vector3D.GetVnlVector() == vnlVector, "vnl_vector assigned to mitk vector")
   MITK_TEST_CONDITION( vector3D == valuesToCopy, "correct values were assigned" )
 }
 
-static void Test_vnl2mitk_DifferentType()
+static void Test_vnl2mitk_DifferentType(void)
 {
 
   mitk::Vector<double, 3> vector3D = originalValues;
   vnl_vector<float> vnlVector(3);
   vnlVector.set(valuesToCopyFloat);
 
   vector3D = vnlVector;
 
-  MITK_TEST_CONDITION( EqualArray(vector3D, vnlVector, 3, vnl_math::float_eps * 10.0), "vnl_vector assigned to mitk vector")
+  MITK_TEST_CONDITION( EqualArray(vector3D, vnlVector, 3, vnl_math::float_eps * 10.0), "vnl_vector float assigned to mitk vector double")
   MITK_TEST_CONDITION( EqualArray(vector3D, valuesToCopy, 3,  vnl_math::float_eps * 10.0), "correct values were assigned" )
 }
 
 /**
  * tests if constructing a mitk::Vector using a shorter in size vnl_vector is handled properly.
  * Attention:
  * say you have a mitk::Vector holding {1, 2, 3}.
  * Now you assign a vnl_vector holdin {4, 5}.
  *
  * The result will be {4, 5, 0}, not {4, 5, 3}
  */
-static void Test_vnl2mitk_ShorterVectorInConstructor()
+static void Test_vnl2mitk_ShorterVectorInConstructor(void)
 {
   vnl_vector<ScalarType> vnlVector(2);
   vnlVector.set(valuesToCopy);
 
   mitk::Vector3D vector3D = vnlVector;
 
   bool firstTwoElementsCopied = EqualArray(vector3D, vnlVector, 2);
   bool lastElementIs0 = (vector3D[2] == 0.0);
 
   MITK_TEST_CONDITION(
       firstTwoElementsCopied && lastElementIs0, "shorter vnl vector correctly copied to mitk vector" )
 }
 
 //static void Test_vnl2mitk_ShorterVectorAssigned()
 //{
 //  mitk::Vector3D vector3D = originalValues;
 //  vnl_vector<ScalarType> vnlVector(2);
 //  vnlVector.set(valuesToCopy);
 //
 //  vector3D = vnlVector;
 //
 //  bool firstTwoElementsCopied = EqualArray(vector3D, vnlVector, 2);
 //  bool lastElementUnchanged = (vector3D[2] == originalValues[2]);
 //
 //  MITK_TEST_CONDITION(
 //      firstTwoElementsCopied && lastElementUnchanged, "shorter vnl vector correctly assigned to mitk vector" )
 //}
 
+static void Test_mitk2vnl(void)
+{
+  vnl_vector<ScalarType> vnlVector(3);
+  vnlVector.set(originalValues);
+  mitk::Vector3D vector3D = valuesToCopy;
+
+  vnlVector = vector3D;
+
+  MITK_TEST_CONDITION( vnlVector == vector3D.GetVnlVector(), "mitk vector assigned to vnlVector")
+  MITK_TEST_CONDITION( EqualArray(vnlVector, valuesToCopy, 3), "correct values were assigned" )
+}
+
+static void Test_mitk2vnl_DifferentType(void)
+{
+  vnl_vector<float> vnlVector(3);
+  vnlVector.set(originalValuesFloat);
+  mitk::Vector3D vector3D = valuesToCopy;
+
+  vnlVector = vector3D;
+
+  MITK_TEST_CONDITION( EqualArray(vnlVector, vector3D, 3, vnl_math::float_eps * 10.0), "mitk vector double assigned to vnlVector float")
+  MITK_TEST_CONDITION( EqualArray(vnlVector, valuesToCopy, 3, vnl_math::float_eps * 10.0), "correct values were assigned" )
+}
+
+
+
+
 /**
  * tests if constructing a mitk::Vector using a large in size vnl_vector is handled properly
  */
 static void Test_vnl2mitk_LargerVectorConstructor()
 {
   ScalarType largerValuesToCopy[] = {4.12345678910, 5.10987654321, 6.123456789132456, 7.123456987789456};
   mitk::Vector3D vector3D = originalValues;
   vnl_vector<ScalarType> vnlVector(4);
   vnlVector.set(largerValuesToCopy);
 
   vector3D = vnlVector;
 
   MITK_TEST_CONDITION(EqualArray(vector3D, largerValuesToCopy, 3), "larger vnl vector correctly assigned to mitk vector" )
 }
 
 
 
 /**
 * Test the conversions from and to the mitk vector type
 */
 int mitkTypeVectorConversionTest(int /*argc*/ , char* /*argv*/[])
 {
   // always start with this!
   MITK_TEST_BEGIN("VectorConversionTest")
 
   Test_pod2mitk();
   Test_pod2mitk_DifferentType();
 
   Test_mitk2pod();
   Test_mitk2pod_DifferentType();
 
   Test_oneElement2mitk();
   Test_oneElement2mitk_DifferentType();
 
   Test_mitk2mitk_DifferentType();
   Test_mitk2mitk_ShorterVectorAssigned();
 
   Test_itk2mitk();
   Test_itk2mitk_DifferentType();
 
   Test_mitk2itk();
   Test_mitk2itk_DifferentType();
 
   Test_vnlfixed2mitk();
   Test_vnlfixed2mitk_DifferentType();
 
   Test_mitk2vnlfixed();
   Test_mitk2vnlfixed_DifferentType();
 
   Test_vnl2mitk();
   Test_vnl2mitk_DifferentType();
   Test_vnl2mitk_ShorterVectorInConstructor();
   //Test_vnl2mitk_ShorterVectorAssigned();
   Test_vnl2mitk_LargerVectorConstructor();
 
+  Test_mitk2vnl();
+  Test_mitk2vnl_DifferentType();
+
   MITK_TEST_END()
 
 }