Merge pull request #536 from wigyori/cc-sec