Fixes issue 104.
5 files changed