bug fix 
Merge commit '501d95a8eecfcbe43683cecf9a7ac842df9e3586'

Conflicts:
	html_parser.py