Issue #14 and #15.