diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 8e7cbb5b..8103068d 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -31,9 +31,9 @@ else()
 	endif()
 endif()
 
-#add_subdirectory(bindings)
 add_subdirectory(PolyVoxCore)
 add_subdirectory(PolyVoxUtil)
+#add_subdirectory(bindings)
 
 #Set up install paths e.g. for PolyVoxConfig.cmake
 if(WIN32)
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
index aa97f87f..d2c2edfc 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
@@ -36,6 +36,7 @@ namespace PolyVox
 	class SimpleVolume
 	{
 	public:
+		#ifndef SWIG
 		class Block
 		{
 			//Make Sampler a friend
@@ -129,6 +130,7 @@ namespace PolyVox
 			//Other current position information
 			VoxelType* mCurrentVoxel;
 		};
+		#endif
 
 	public:
 		/// Constructor for creating a fixed size volume.
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index a25eec1d..db4d46a2 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -27,8 +27,8 @@
 //%include "Array.i"
 %include "VertexTypes.i"
 %include "SurfaceMesh.i"
-%include "SimpleVolumeSampler.i"
+//%include "SimpleVolumeSampler.i"
 %include "SurfaceExtractor.i"
-%include "CubicSurfaceExtractor.i"
-%include "CubicSurfaceExtractorWithNormals.i"
+//%include "CubicSurfaceExtractor.i"
+//%include "CubicSurfaceExtractorWithNormals.i"
 //%include "MeshDecimator.i"
\ No newline at end of file
diff --git a/library/bindings/SurfaceExtractor.i b/library/bindings/SurfaceExtractor.i
index 81ff4797..8e34a278 100644
--- a/library/bindings/SurfaceExtractor.i
+++ b/library/bindings/SurfaceExtractor.i
@@ -2,10 +2,29 @@
 %{
 #include "SimpleVolume.h"
 #include "SurfaceExtractor.h"
+#include "PolyVoxCore/Material.h"
+
+namespace PolyVox
+{
+	class SurfaceExtractorSimpleVolumeMaterial8 : public SurfaceExtractor<SimpleVolume, Material8>
+	{
+		public:
+			SurfaceExtractorSimpleVolumeMaterial8(SimpleVolume<Material8>* volData, Region region, SurfaceMesh<PositionMaterialNormal>* result)
+			: SurfaceExtractor<SimpleVolume, Material8>(volData, region, result) {}
+			void execute() { SurfaceExtractor<SimpleVolume, Material8>::execute(); }
+	};
+};
 %}
 
 %include "SimpleVolume.h"
 %include "SurfaceExtractor.h"
 
-%template(SurfaceExtractorMaterial8) PolyVox::SurfaceExtractor<PolyVox::Material8>;
-%template(SurfaceExtractorDensity8) PolyVox::SurfaceExtractor<PolyVox::Density8>;
\ No newline at end of file
+namespace PolyVox
+{
+	class SurfaceExtractorSimpleVolumeMaterial8 : public SurfaceExtractor<SimpleVolume, Material8>
+	{
+		public:
+			SurfaceExtractorSimpleVolumeMaterial8(SimpleVolume<Material8>* volData, Region region, SurfaceMesh<PositionMaterialNormal>* result);
+			void execute();
+	};
+};