Added support for user function syntax (no funcs yet)
Merge remote-tracking branch 'origin/master'