Merge pull request #2 from evansiroky/china

China