Issue #8: Fixed.
Issue #9: Fixed.