diff --git a/Makefile.dist b/Makefile.dist
index 46d5c302d3e2ac3046d8f459ffb5618dad331b35..011cf3c255d724cc5bf705c5f45a48eebd34f98c 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -10,6 +10,7 @@ dist-src:
 	find dist/flann-${VER}-src/src -name '*.dat' -delete
 	rm -rf dist/flann-${VER}-src/src/cpp/tests/test*
 	rm -rf dist/flann-${VER}-src/src/python/_tests
+	rm -rf dist/flann-${VER}-src/src/python/build
 	# cmake dir
 	cp -r cmake dist/flann-${VER}-src
 	# bin dir
diff --git a/src/cpp/flann/algorithms/linear_index.h b/src/cpp/flann/algorithms/linear_index.h
index 34dc665db3d61a7067a0dd9f4d3fcaa25f0c16c1..76b8c63e17051c1f3ff3ee7ae8148163a731b369 100644
--- a/src/cpp/flann/algorithms/linear_index.h
+++ b/src/cpp/flann/algorithms/linear_index.h
@@ -59,8 +59,7 @@ struct LinearIndexParams : public IndexParams {
 };
 
 template <typename Distance>
-//class LinearIndex : public NNIndex<Distance>
-class LinearIndex
+class LinearIndex : public NNIndex<Distance>
 {
 	typedef typename Distance::ElementType ElementType;
 	typedef typename Distance::ResultType DistanceType;
@@ -116,15 +115,7 @@ public:
 		/* nothing to do here for linear search */
     }
 
-//	void findNeighbors(ResultSet<DistanceType>& resultSet, const ElementType* vec, const SearchParams& searchParams)
-//	{
-//		for (size_t i=0;i<dataset.rows;++i) {
-//			DistanceType dist = distance(dataset[i],vec, dataset.cols);
-//			resultSet.addPoint(dist,i);
-//		}
-//	}
-
-	void findNeighbors(ResultSet<DistanceType>& resultSet, const ElementType* vec)
+	void findNeighbors(ResultSet<DistanceType>& resultSet, const ElementType* vec, const SearchParams& searchParams)
 	{
 		for (size_t i=0;i<dataset.rows;++i) {
 			DistanceType dist = distance(dataset[i],vec, dataset.cols);