Bakst HW7
Merge pull request #120 from lbakst/HW7_branch

Bakst HW7