Merge hw4 into master

Merge hw3 into master