Merge pull request #1 from guillefd/styling

Styling
Merge pull request #2 from guillefd/master

Merge pull request #1 from guillefd/styling