TODO update
settings
Revert "settings"

This reverts commit c685e920bd670228414eea188f3b2eb17c792b6c.
Merge pull request #1 from leezardking/development

testing pull request