Support folders.
Merge branch 'master' into folders
Merge branch 'master' into folders
Merge pull request #2 from jglick/folders

Support folders.