settings update
Merge pull request #15 from ulberge/settings

settings update