folder support
Merge pull request #83 from daniellemayne/develop

folder support