Please merge my code

:palm_tree: It's really awesome, I promise.