Start working on #19.
Remaining work (to add in the task):
This will create a new commit in order to revert the existing changes.
