Implemented issue #6