add g
add h
Merge branch 'master' of https://github.com/vfa-tinnt/final into 5.0