Add maxdistance entry
Merge branch 'jrouly'