Add feature-C
Fix typo
Merge branch 'feature-C'