Merge pull request #28 from eastfire/master

update