Issue #7, issue #2 implemented.