Merge pull request #36 from eastfire/master

update