Merge pull request #12 from eastfire/master

update