Indentions, code style and copyright headers
Merge branch 'stoewer'