merge request #460