Support directory name as a data key
Merge pull request #836 from tricknotes/directory-as-a-data-key

Support directory name as a data key