Made compatible to CB 1.6.4Rxx
Merge pull request #3 from sprenger120/master

Made compatible to CB 1.6.4Rxx