Assignment 2
fixes #17