Merge pull request #68 from daniellemayne/develop

folder support