Merge pull request #83 from daniellemayne/develop

folder support
Merge remote-tracking branch 'upstream/develop' into develop