Merge pull request #1 from twurz/master

pulling cc-07 files
Merge pull request #3 from JulesVan/master

Merge pull request #1 from twurz/master