Merge pull request #5 from skk/master

Merge skk/feature/dir_walking
Merge pull request #6 from skk/develop

Merge pull request #5 from skk/master