[DEV] manage the template function in parsing (not written in doc ...)
[DEV] change display of fucntion
Merge remote-tracking branch 'origin/master' into dev