issue #10

Reference to the issue #10