Improve default setting
Merge pull request #3 from agarzola/master

Improve default setting