Merge branch 'new_api'

Conflicts:
	metadata.json