Using distance
Merge branch 'master' of https://github.com/FCO/FasterEntry into gh-pages