Merge pull request #107 from liaoxuezhi/dev-refactor

Popover code review