Merge pull request #1073 from ey6es/master

These should actually start at two pi (that's the maximum distance).