added CHN and fixes from http://goo.gl/BDVS1E