Merge css-writer branch