CBC comments
Merge pull request #20 from niamu/master

CBC comments fix