Merge pull request #1 from vczh/master

rebase