Merge new style into master