Merge pull request #10 from eastfire/master

update2