[jh] further changes for CHINA
[jh] China and India
Merge branch 'master' of https://github.com/PeterPaulPeterPaul/ids.git
[jh] various changes for others