Merge pull request #149 from daniellemayne/develop

folder support