add function3 and function4
Merge branch 'master' into trunk