Add solution to problem 16
Add solution to problem 18