Merge pull request #223 from fantasticfears/china