Fixing issue #8 and issue #6