Completes part-1
Merge branch 'develop' into task/part-1
Merge pull request #1 from Meir-Shapiro/task/part-1

task/part-1