Completed exercise #16
Completed exercise #17