Implemented issue #8