Merge pull request #1 from johandelouche/master

First pull
Settings change
.gitignore update
Test
Merge pull request #1 from tsnobip/master

Pull request #2