add directory check.
Merge branch 'feature-test'