Merge pull request #496 from xsdg/view_file_po