Merge pull request #1 from rogerwang/master

x