Issue #14, partly implemented.