Merge pull request #12 from kbond/directory-namer