Merge Changes from Main Repository
Fix Import for 'cloze'