viviac3's pull request

Hi yiran, im pretty sure this time i did it right, could you check it for me?
Thanks!