Style

Merging style with master