Merge pull request #549 from wigyori/cc-sec