Fixes #21
3 files changed