Added problems 15 and 16, fixed #11