Formatting
Merge branch 'master' of github.com:arthaud/moc
Formatting again