Google Code-In

Here's my pull request and changes as instructed by Google Code-In task mentors.