With testing via distance based
Merge branch 'master' of github.com:FastFox/nn1.2

hoi