ass
 szdf
Merge branch 'master' into gh-pages

Conflicts:
	example/index.html
Merge branch 'master' into gh-pages