Merge pull request #1 from hoosin/master

update