Added feature D
Merge branch 'featureD'