use new directory
Merge branch 'master' into new-directory
Merge pull request #8 from Trott/new-directory

New directory