Properly support environment variable with whitespace. This fixes #65