fmetze Merge pull request #212 from csukuangfj/patch-1