Merge pull request #1 from louie-liu/master

update