better output, allow distance as a parameter
Merge remote-tracking branch 'origin/master'