add new functions
test
change to two functions
some changes
test
Merge branch 'master' of https://github.com/yanshu/lab3