Merge pull request #1 from westjour/hw2-branch

merge updates from Hw2 branch into master