Formatting etc.
Merge pull request #4 from simonatecsa/master

Formatting etc.