merge request #8