Fix bug.
Test pathdir
Merge remote-tracking branch 'local/master'