Merge pull request #40 from daniellemayne/develop

folder support