Merge pull request #39 from dbeckwith/req6

Req6
Merge branch 'team9dev' into req6