Merge pull request #7 from vmcilwain/week4

Week4 pull request 2
Merge branch 'master' into week5
update test coverate