Task B

- Fixes #2