Implemented enhancement #57.