Merge pull request #91 from daniellemayne/develop

folder support