Implemented issue #12