Reworked problem 3
Merge branch 'problem/3' into develop
Merge branch 'develop'