Substituted the file emailed by Panagiotis Spentzouris on October 21.  There was some
difficulty when he tried to upload to git.