diff --git a/library/PolyVoxCore/include/PolyVoxCore/Mesh.h b/library/PolyVoxCore/include/PolyVoxCore/Mesh.h
index 6b122323..45f78930 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Mesh.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Mesh.h
@@ -38,12 +38,13 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
-	template <typename VertexType>
+	template <typename VertexType, typename IndexType = uint32_t>
 	class Mesh
 	{
 	public:
 
 		typedef VertexType VertexType;
+		typedef IndexType IndexType;
 
 		Mesh();
 		~Mesh();	   
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Mesh.inl b/library/PolyVoxCore/include/PolyVoxCore/Mesh.inl
index d2363046..7a57c748 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Mesh.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/Mesh.inl
@@ -23,54 +23,54 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
-	template <typename VertexType>
-	Mesh<VertexType>::Mesh()
+	template <typename VertexType, typename IndexType>
+	Mesh<VertexType, IndexType>::Mesh()
 	{
 	}
 
-	template <typename VertexType>
-	Mesh<VertexType>::~Mesh()	  
+	template <typename VertexType, typename IndexType>
+	Mesh<VertexType, IndexType>::~Mesh()	  
 	{
 	}
 
-	template <typename VertexType>
-	const std::vector<uint32_t>& Mesh<VertexType>::getIndices(void) const
+	template <typename VertexType, typename IndexType>
+	const std::vector<uint32_t>& Mesh<VertexType, IndexType>::getIndices(void) const
 	{
 		return m_vecTriangleIndices;
 	}
 
-	template <typename VertexType>
-	uint32_t Mesh<VertexType>::getNoOfIndices(void) const
+	template <typename VertexType, typename IndexType>
+	uint32_t Mesh<VertexType, IndexType>::getNoOfIndices(void) const
 	{
 		return m_vecTriangleIndices.size();
 	}
 
-	template <typename VertexType>
-	uint32_t Mesh<VertexType>::getNoOfVertices(void) const
+	template <typename VertexType, typename IndexType>
+	uint32_t Mesh<VertexType, IndexType>::getNoOfVertices(void) const
 	{
 		return m_vecVertices.size();
 	}
 
-	template <typename VertexType>
-	const std::vector<VertexType>& Mesh<VertexType>::getVertices(void) const
+	template <typename VertexType, typename IndexType>
+	const std::vector<VertexType>& Mesh<VertexType, IndexType>::getVertices(void) const
 	{
 		return m_vecVertices;
 	}
 
-	template <typename VertexType>
-	const Vector3DInt32& Mesh<VertexType>::getOffset(void) const
+	template <typename VertexType, typename IndexType>
+	const Vector3DInt32& Mesh<VertexType, IndexType>::getOffset(void) const
 	{
 		return m_offset;
 	}
 
-	template <typename VertexType>
-	void Mesh<VertexType>::setOffset(const Vector3DInt32& offset)
+	template <typename VertexType, typename IndexType>
+	void Mesh<VertexType, IndexType>::setOffset(const Vector3DInt32& offset)
 	{
 		m_offset = offset;
 	}
 
-	template <typename VertexType>
-	void Mesh<VertexType>::addTriangle(uint32_t index0, uint32_t index1, uint32_t index2)
+	template <typename VertexType, typename IndexType>
+	void Mesh<VertexType, IndexType>::addTriangle(uint32_t index0, uint32_t index1, uint32_t index2)
 	{
 		//Make sure the specified indices correspond to valid vertices.
 		POLYVOX_ASSERT(index0 < m_vecVertices.size(), "Index points at an invalid vertex.");
@@ -82,28 +82,28 @@ namespace PolyVox
 		m_vecTriangleIndices.push_back(index2);
 	}
 
-	template <typename VertexType>
-	uint32_t Mesh<VertexType>::addVertex(const VertexType& vertex)
+	template <typename VertexType, typename IndexType>
+	uint32_t Mesh<VertexType, IndexType>::addVertex(const VertexType& vertex)
 	{
 		m_vecVertices.push_back(vertex);
 		return m_vecVertices.size() - 1;
 	}
 
-	template <typename VertexType>
-	void Mesh<VertexType>::clear(void)
+	template <typename VertexType, typename IndexType>
+	void Mesh<VertexType, IndexType>::clear(void)
 	{
 		m_vecVertices.clear();
 		m_vecTriangleIndices.clear();
 	}
 
-	template <typename VertexType>
-	bool Mesh<VertexType>::isEmpty(void) const
+	template <typename VertexType, typename IndexType>
+	bool Mesh<VertexType, IndexType>::isEmpty(void) const
 	{
 		return (getNoOfVertices() == 0) || (getNoOfIndices() == 0);
 	}
 
-	template <typename VertexType>
-	void Mesh<VertexType>::removeUnusedVertices(void)
+	template <typename VertexType, typename IndexType>
+	void Mesh<VertexType, IndexType>::removeUnusedVertices(void)
 	{
 		std::vector<bool> isVertexUsed(m_vecVertices.size());
 		std::fill(isVertexUsed.begin(), isVertexUsed.end(), false);
diff --git a/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
index 49bd882c..e4555893 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
@@ -108,6 +108,11 @@ namespace PolyVox
 	////////////////////////////////////////////////////////////////////////////////
 	template <typename VoxelType> class LargeVolume;
 
+	////////////////////////////////////////////////////////////////////////////////
+	// MarchingCubesSurfaceExtractor
+	////////////////////////////////////////////////////////////////////////////////
+	template<typename VolumeType, typename Controller> class MarchingCubesSurfaceExtractor;
+
 	////////////////////////////////////////////////////////////////////////////////
 	// MarchingCubesVertex
 	////////////////////////////////////////////////////////////////////////////////
@@ -134,6 +139,11 @@ namespace PolyVox
 	typedef MaterialDensityPair<uint8_t, 4, 4> MaterialDensityPair44;
 	typedef MaterialDensityPair<uint16_t, 8, 8> MaterialDensityPair88;
 
+	////////////////////////////////////////////////////////////////////////////////
+	// Mesh
+	////////////////////////////////////////////////////////////////////////////////
+	template <typename VertexType, typename IndexType> class Mesh;
+
 	////////////////////////////////////////////////////////////////////////////////
 	// Pager
 	////////////////////////////////////////////////////////////////////////////////
@@ -154,16 +164,6 @@ namespace PolyVox
 	////////////////////////////////////////////////////////////////////////////////
 	template <typename VoxelType> class SimpleVolume;
 
-	////////////////////////////////////////////////////////////////////////////////
-	// MarchingCubesSurfaceExtractor
-	////////////////////////////////////////////////////////////////////////////////
-	template<typename VolumeType, typename Controller> class MarchingCubesSurfaceExtractor;
-
-	////////////////////////////////////////////////////////////////////////////////
-	// Mesh
-	////////////////////////////////////////////////////////////////////////////////
-	template <typename VertexType> class Mesh;
-
 	////////////////////////////////////////////////////////////////////////////////
 	// Vector
 	////////////////////////////////////////////////////////////////////////////////