Started and completed problem 67
Merge branch 'problem/67' into develop