Implemented issue #20.