Merge pull request #30 from eagledu/master

update version 130402
fixed distance bug
merge update
merge conflict file