Merge pull request #1 from twurz/master

pulling cc-07 files