Completes issue #4