Changed source formatting (for real this time)
Merge remote-tracking branch 'origin/master'