update
Merge pull request #9 from ktzhang/frankie2

update