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

Refactor haoming