Add wolfram API functionality
Resolve merge conflict master|wolfram