Use API
Merge branch 'master' into oja-br-mode

Conflicts:
	example.js