Implemented issue #13.