Close of issue #9