Improved ResolveEnvVar and add support of tilde (~/...)