Issue #14, issue #21 fixed.