merge zhukejun's pull request