make some change on feiko.txt in feature3 branch
Merge branch 'feature3'