Merge pull request #88 from daniellemayne/develop

folder support