d225 : merged Artifice's #143 pull request