Updating API
Merge remote-tracking branch 'original/1.0.0'