folder support
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #181 from daniellemayne/develop

folder support