Add new feature2.
Fix feature2.
Merge branch 'feature2'