merged commit from fuqcool:master and record the contributors