Following the exercise, Fixes #1

Here are my comments about this pull request.