Fixed feature1
Merge branch 'feature1-fix'