Fixed feature1.
Merge branch 'fix-feature1'