Merge pull request #8 from eastfire/master

update