fixed distance
Merge branch 'develop'