new function1 and function2
Merge branch 'master' into trunk