This commit is related to task #9