Merge API and master