fixed setting
Merge branch 'master' of https://github.com/ck520702002/iDoNET