Issue #31 implemented.