d227 : merged Artifice's #145 pull request