Merge pull request #9 from SamCD/master

HW #7