Merge pull request #29 from fxbonnet/master

Code format (mainly en of lines)
Merge pull request #30 from fxbonnet/master

.gitignore