Merge pull request #543 from wigyori/cc-sec