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

rewrite poll changes, rewrite test cases