Merge pull request #3 from eastfire/master

update