Updates to support platform-agnostic use (Windows vs. *nix)