use path resolve
fix conflict
Bump version
Merge pull request #2 from aj-self/use_path_resolve

use path resolve