edit on english sup
Merged onto master