Merge FeatureB

Add feature B