Merge pull request #34 from 30x/refactor-haoming

no race in token now