prolog files
merged in master