Solve question 6
Merge remote-tracking branch 'pivlano/q6-solution'
Improve question 6 solution and tests