Updted to CB-1.6.4 stable