some updates
Merge branch 'master' of https://github.com/a696385/a.config