Merge in Geoff's changes to the Viewer which handles downloaded file names better and removes right click option menu.