Merge branch 'bug-d'

Conflicts:
	sample.php