Replaced 'nix-specific shell commands with file utils
Merge branch 'v0.7'