Merge branch 'pr/2'

Conflicts:
	codeFormatter.php