Simplification because now the maximum_distance is mandatory
Merge pull request #1529 from gem/mandatory-maximum_distance

Simplification because now the maximum_distance is mandatory