Used File#expand_path for better file support