Pull from wikankun - #2

Pull from wikankun#2

wikankun wants to merge 3 commits into

ComputingTelU:masterComputingTelU/internship-basic-gen3:masterfrom

wikankun:masterCopy head branch name to clipboard