Merge pull request #32 from eastfire/master

update