Task B

- Fixes #2
Merge pull request #4 from ctdean/cd_b

Task B