Fixes issue #1.
4 files changed