Issue #4 implemented.