Merge pull request #516 from negativeExponent/vfs