Small changes
Merge pull request #121 from mr-mr/ccbranch

Small changes