added cindent
merge