Fixes issue 139 and issue 140.
2 files changed