Ready to merge hw1 part 2 bug fix back to master