Updated for CB 1.6.2.R2
Merge pull request #1 from erocs/master

Updated for CB 1.6.2.R2