Resolution of issue #3 and issue #7