Nanoflann bundle

Tries to solve #1936