adding a few functions
Merge remote-tracking branch 'origin/master' into Roberto