Merge pull request #1 from eastfire/master

update