Merge pull request #10 from b91961/master

Get project 2 branch up to date.