Implemented the task
Merge branch 'homework3'