Adding settings
Merge pull request #1 from maelnor/master

Settings