update
Merge branch 'master' of github.com:valefor/HVF

Conflicts:
	h.j
update