Completed problem 1
Merge branch 'feature/problem-1'