Merge branch 'master' into develop
update README.md
remove some obsolete code, and UPDATE config.ini
Merge branch 'develop'