Merged pull request from Croxis for virtualfs

(Hopefully works)