Close of issue #3