Enhancement, Implementation of issue #12 .

Implementation of issue #12 .