Add solutions for problems #16 and #20