Use data() instead of get() and set()
Merge branch 'data-api' into gh-pages

Conflicts:
	README.md