Merge pull request #1 from westjour/hw2-branch

merge updates from Hw2 branch into master
Merge pull request #2 from westjour/master

Merge pull request #1 from westjour/hw2-branch