Initial API commit
Merge remote-tracking branch 'origin/api'