Issue #40 - part solution
Merge remote-tracking branch 'upstream/master'

Conflicts:
	system/class/Html.php
Merge pull request #44 from piotr-rusol/master

Issue #40