Implemented issue #21