KdTree
Merge branch 'tim'