d230 : merged Artifice's #150 pull request