updated to 1.8.0
marged from cc-1.6