Implemented feature #58.