settings
Merge pull request #13 from Aloalo/master

settings