Issue #5702: Update API
Merge pull request #648 from VisualSJ/master

Issue #5702: Update API