Incorporated Dennis' fix to 'diff' command