Implemented issue #66