Issue #18 implemented.