Merge pull request #3 from idreamshen/master