Merge pull request #30 from eastfire/master

update