[ #6 ] solve problem 2 with DP
Merge branch 'feature/issue/6' into develop