update function lib
Merge remote-tracking branch 'upstream/master'