v0.3.7

Adds `file.folder`, cleanup
Merge branch 'origin/master'
Merge branch 'origin/master'
v0.3.8

Merge in async methods.