Merge hw4 into master