settings
Merge pull request #1 from RickyShi/master

settings