New setting
Merge pull request #23 from mariogrip/master

New setting