Merge pull request #20 from eastfire/master

update