Merge pull request #1 from ShawnHuang/master

I have already merge your version and mine. Please update your guides before you edit. THX!