Merge pull request #264 from wigyori/cc-dm9601