Using a wrapper function in order to get the retval working even if user didn't use return
Merge remote-tracking branch 'origin/master'