error catch
Merge branch 'working'

Conflicts:
	src/binding/html.js
version bump