Merge pull request #16 from eastfire/master

update