Merge pull request #1 from ZZhiming/master

das