++ implemented issue #3