added support for single-file-system hack
merged with github