pull request issue3 from peng