Merge pull request #18 from eastfire/master

update