Added last version of Assignment 1