Merging styled branch to master