Merge pull request #26 from eastfire/master

update