distance conversion mistake
merge update
merge conflict file
Merge pull request #31 from eagledu/master

merge update 130403