Added support for *nix