Merge pull D

Merge