Merge with master
Formatting