Refactoring
Solution 4
Merge branch 'feature/problem-4' into develop