diff --git a/code/algorithms/rttbDoseToVolumeMeasureCollection.h b/code/algorithms/rttbDoseToVolumeMeasureCollection.h
index b1687f8..83af22b 100644
--- a/code/algorithms/rttbDoseToVolumeMeasureCollection.h
+++ b/code/algorithms/rttbDoseToVolumeMeasureCollection.h
@@ -1,74 +1,82 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // This software is distributed WITHOUT ANY WARRANTY; without even
 // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.  See the above copyright notices for more information.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1674 $ (last changed revision)
 // @date    $Date: 2017-01-27 10:34:46 +0100 (Fr, 27 Jan 2017) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #ifndef __DOSE_TO_VOLUME_MEASURE_COLLECTION_H
 #define __DOSE_TO_VOLUME_MEASURE_COLLECTION_H
 
 #include "rttbMeasureCollection.h"
 #include <rttbCommon.h>
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace rttb
 {
 
 	namespace algorithms
 	{
 		/*! @class DoseToVolumeMeasureCollection
 		@brief This class handels the access to the DoseToVolumeMeasureCollection elements for a specific complex statistic
 		@note _referenceDose has to be set to use getValueRelative() otherwise an exception is thrown
 		*/
 		class RTTBAlgorithms_EXPORT DoseToVolumeMeasureCollection : public MeasureCollection {
 
 		public:
       rttbClassMacro(DoseToVolumeMeasureCollection, MeasureCollection)
 			typedef std::map<DoseTypeGy, VolumeType> DoseToVolumeFunctionType;
 
 		private:
 			complexStatistics _name;
 			DoseTypeGy _referenceDose;
 			DoseToVolumeFunctionType _values;
 
 		public:
 			DoseToVolumeMeasureCollection(complexStatistics name, DoseTypeGy referenceDose = -1);
 			
 			/*! @brief This has to be set >=0 to use getValueRelative()
 			*/
 			void setReferenceDose(DoseTypeGy referenceDose);
 
 			void insertValue(DoseTypeGy dose, VolumeType volume);
 
 			/*! @brief Gets the volume irradiated with a dose >= x, depending on the complexStatistics name.
 				@return Return absolute volume in absolute cm^3.
 				@exception InvalidDoseException if the vector values is empty or _referenceDose is -1
 				@exception NoDataException if the requested Dose is not in the vector
 			*/
 			VolumeType getValue(DoseTypeGy xVolumeAbsolute) const;
 			VolumeType getValue(DoseTypeGy xVolumeAbsolute, bool findNearestValue, DoseTypeGy& nearestXDose) const;
 			VolumeType getValueRelative(DoseTypeGy xDoseRelative) const;
 			VolumeType getValueRelative(DoseTypeGy xDoseRelative, bool findNearestValue, DoseTypeGy& nearestXDose) const;
 			DoseToVolumeFunctionType getAllValues() const;
 			
 			friend bool operator==(const DoseToVolumeMeasureCollection& volumeToDoseMesureCollection, const DoseToVolumeMeasureCollection& otherVolumeToDoseMesureCollection);
 		};
 	}
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #endif
diff --git a/code/algorithms/rttbDoseToVolumeMeasureCollectionCalculator.h b/code/algorithms/rttbDoseToVolumeMeasureCollectionCalculator.h
index 56de578..b07d0e3 100644
--- a/code/algorithms/rttbDoseToVolumeMeasureCollectionCalculator.h
+++ b/code/algorithms/rttbDoseToVolumeMeasureCollectionCalculator.h
@@ -1,91 +1,99 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // This software is distributed WITHOUT ANY WARRANTY; without even
 // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.  See the above copyright notices for more information.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1674 $ (last changed revision)
 // @date    $Date: 2017-01-27 10:34:46 +0100 (Fr, 27 Jan 2017) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #ifndef __DOSE_TO_VOLUME_MEASURE_COLLECTION_CALCULATOR_H
 #define __DOSE_TO_VOLUME_MEASURE_COLLECTION_CALCULATOR_H
 
 #include <vector>
 #include <map>
 
 #include "rttbBaseType.h"
 
 #include "RTTBAlgorithmsExports.h"
 #include "rttbDoseToVolumeMeasureCollection.h"
 
 #include "rttbDoseIteratorInterface.h"
 
 #include <rttbCommon.h>
 #include "rttbDoseStatistics.h"
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace rttb
 {
 
 	namespace algorithms
 	{
 		/*! @class DoseToVolumeMeasureCollectionCalculator
 		@brief Class for calculating DoseToVolume measures
 		@details This class is used as a basis for DoseToVolumeMeasureCollectionCalculators. It implements the compute() method 
 		that is the same for every inheriting subclass, it accesses computeSpecificValue, which has to be implemented
 		for each different complex statistic.
 		*/
 		class RTTBAlgorithms_EXPORT DoseToVolumeMeasureCollectionCalculator {
 
 		public:
       rttbClassMacroNoParent(DoseToVolumeMeasureCollectionCalculator)
 			typedef std::map<DoseTypeGy, VolumeType> VolumeToDoseFunctionType;
 
 		protected:
 			core::DoseIteratorInterface::Pointer _doseIterator;
 
 		private:
       std::vector<double> _precomputeDoseValues;
 			DoseTypeGy _referenceDose;
 			DoseToVolumeMeasureCollection::Pointer _measureCollection;
 			bool _multiThreading;
 
 		public:
 			/*! @brief Computes not already computed values for the measureCollection. Algorithm for the specific complex Statistic has to be implemented in the corresponding subclass.
 			*/
 			void compute();
 			/*! @brief Adds additional values to the _precomputeDoseValues vector.
 				@exception InvalidParameterException If values vector contains values that are not between 0 and 1
 			*/
 			void addPrecomputeDoseValues(const std::vector<double>& values);
 			DoseToVolumeMeasureCollection::Pointer getMeasureCollection();
 
 		protected:
 			DoseToVolumeMeasureCollectionCalculator(const std::vector<double>& precomputeDoseValues,
 				const DoseTypeGy referenceDose, const core::DoseIteratorInterface::Pointer doseIterator, 
 				DoseToVolumeMeasureCollection::complexStatistics name, bool multiThreading);
 
 			void insertIntoMeasureCollection(DoseTypeGy xAbsolute, VolumeType resultVolume);
 
 			/*! @brief Computes the specific VolumeType depending on the complext statistic
 			@note has to be overwritten
 			*/
 			virtual VolumeType computeSpecificValue(double xAbsolute) const = 0;
 		};
 
 	}
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #endif
diff --git a/code/algorithms/rttbVolumeToDoseMeasureCollection.h b/code/algorithms/rttbVolumeToDoseMeasureCollection.h
index ffddcf6..0f0b39a 100644
--- a/code/algorithms/rttbVolumeToDoseMeasureCollection.h
+++ b/code/algorithms/rttbVolumeToDoseMeasureCollection.h
@@ -1,74 +1,82 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // This software is distributed WITHOUT ANY WARRANTY; without even
 // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.  See the above copyright notices for more information.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1674 $ (last changed revision)
 // @date    $Date: 2017-01-27 10:34:46 +0100 (Fr, 27 Jan 2017) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #ifndef __VOLUME_TO_DOSE_MEASURE_COLLECTION_H
 #define __VOLUME_TO_DOSE_MEASURE_COLLECTION_H
 
 #include "rttbMeasureCollection.h"
 #include <rttbCommon.h>
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace rttb
 {
 
 	namespace algorithms
 	{
 		/*! @class VolumeToDoseMeasureCollection
 		@brief This class handels the access to the VolumeToDoseMeasureCollection elements for a specific complex statistic
 		@note _volume has to be set to use getValueRelative() otherwise an exception is thrown
 		*/
 		class RTTBAlgorithms_EXPORT VolumeToDoseMeasureCollection : public MeasureCollection {
 
 		public:
       rttbClassMacro(VolumeToDoseMeasureCollection, MeasureCollection)
 			typedef std::map<VolumeType, DoseTypeGy> VolumeToDoseFunctionType;
 
 		private:
       complexStatistics _name;
 			VolumeType _volume;
 			VolumeToDoseFunctionType _values;
 
 		public:
 			VolumeToDoseMeasureCollection(complexStatistics name, VolumeType volume = -1);
 
 			/*! @brief This has to be set >=0 to use getValueRelative()
 			*/
 			void setVolume(VolumeType volume);
 
 			void insertValue(VolumeType volume, DoseTypeGy dose);
 
 			/*! @brief Gets the x of the current volume, depending on the complexStatistics name.
 				@return Return dose value in Gy.
 				@exception InvalidDoseException if the vector values is empty
 				@exception DataNotAvailableException if _volume is not set
 			*/
 			DoseTypeGy getValue(VolumeType xVolumeAbsolute) const;
 			DoseTypeGy getValue(VolumeType xVolumeAbsolute, bool findNearestValue, VolumeType& nearestXDose) const;
 			DoseTypeGy getValueRelative(VolumeType xDoseRelative) const;
 			DoseTypeGy getValueRelative(VolumeType xDoseRelative, bool findNearestValue, VolumeType& nearestXDose) const;
 			VolumeToDoseFunctionType getAllValues() const;
 
 			friend bool operator==(const VolumeToDoseMeasureCollection& volumeToDoseMesureCollection, const VolumeToDoseMeasureCollection& otherVolumeToDoseMesureCollection);
 		};
 	}
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #endif
diff --git a/code/algorithms/rttbVolumeToDoseMeasureCollectionCalculator.h b/code/algorithms/rttbVolumeToDoseMeasureCollectionCalculator.h
index ee6c5af..d9bf743 100644
--- a/code/algorithms/rttbVolumeToDoseMeasureCollectionCalculator.h
+++ b/code/algorithms/rttbVolumeToDoseMeasureCollectionCalculator.h
@@ -1,84 +1,92 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // This software is distributed WITHOUT ANY WARRANTY; without even
 // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.  See the above copyright notices for more information.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1674 $ (last changed revision)
 // @date    $Date: 2017-01-27 10:34:46 +0100 (Fr, 27 Jan 2017) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #ifndef __VOLUME_TO_DOSE_MEASURE_COLLECTION_CALCULATOR_H
 #define __VOLUME_TO_DOSE_MEASURE_COLLECTION_CALCULATOR_H
 
 #include "rttbVolumeToDoseMeasureCollection.h"
 #include <rttbCommon.h>
 #include "rttbDoseStatistics.h"
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251)
+#endif
+
 namespace rttb
 {
 
 	namespace algorithms
 	{
 		/*! @class VolumeToDoseMeasureCollectionCalculator
 		@brief Class for calculating VolumeToDose measures
 		@details This class is used as a basis for VolumeToDoseMeasureCollectionCalculator. It implements the compute() method
 		that is the same for every inheriting subclass, it accesses computeSpecificValue, which has to be implemented
 		for each different complex statistic.
 		*/
 		class RTTBAlgorithms_EXPORT VolumeToDoseMeasureCollectionCalculator {
 
 		public:
       rttbClassMacroNoParent(VolumeToDoseMeasureCollectionCalculator)
 			typedef std::map<VolumeType, DoseTypeGy> VolumeToDoseFunctionType;
 
 		protected:
 			std::vector<DoseTypeGy> _doseVector;
 			DoseVoxelVolumeType _currentVoxelVolume;
 			std::vector<double> _voxelProportionVector;
 
 		private:
       std::vector<double> _precomputeVolumeValues;
 			VolumeType _volume;
 			VolumeToDoseMeasureCollection::Pointer _measureCollection;
 			bool _multiThreading;
 
 		public:
 			/*!  @brief Computes not already computed values for the measureCollection. Algorithm for the specific complex Statistic has to be implemented in the corresponding subclass.
 			*/
 			void compute();
 			/*! @brief Adds additional values to the _precomputeVolumeValues vector.
 			@exception InvalidParameterException If values vector contains values that are not between 0 and 1
 			*/
 			void addPrecomputeVolumeValues(const std::vector<double>& values);
 			VolumeToDoseMeasureCollection::Pointer getMeasureCollection();
 
 		protected:
 			VolumeToDoseMeasureCollectionCalculator(const std::vector<double>& precomputeVolumeValues, const VolumeType volume,
 				const std::vector<DoseTypeGy>& doseVector, const std::vector<double>& voxelProportionVector,
 				const DoseVoxelVolumeType currentVoxelVolume, VolumeToDoseMeasureCollection::complexStatistics name, bool multiThreading);
 
 			void insertIntoMeasureCollection(VolumeType xAbsolute, DoseTypeGy resultDose);
 
 			/*! @brief Computes the specific DoseTypeGy depending on the complext statistic
 			@note has to be overwritten
 			*/
 			virtual DoseTypeGy computeSpecificValue(double xAbsolute) const = 0;
 		};
 
 	}
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #endif