Implemented issue #18