Implemented issue #16