Merge pull request #38 from eastfire/master

update