add 2 function missing
Merge remote-tracking branch 'origin/master'