add func 3
Merge branch 'feature'