Merged Harry Binnema's improvements