Merge request #11