Merge pull request #58 from alanz/wip/vfs