Issue #7, #8 fixed.