Update
Merge pull request #2 from ronaldoyang/master

Update