Make path more smooth, fix restore issue.
Merge pull request #7 from ufo22940268/develop

Make path more smooth, fix restore issue.