Please merge my code

Hello John!!