Integrated Jiayu's text suggestion
Merge branch 'master' of https://github.com/Propolandante/119proj