Merging changes to API into master