fix bug of multiple update event triggered
Merge branch 'master' into gh-pages

Conflicts:
	Readme.md
docs