Changed settings
Merge pull request #8 from stefanmendoza/Stefan

Changed settings