Merge pull request #14 from eastfire/master

update