add feature-c
Merge branch 'feature-c'